You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/12/13 08:56:21 UTC
ambari git commit: AMBARI-14352. Should show error message when
"Pause Upgrade" failed. (Xi Wang via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 8772ea006 -> 38a92b7ff
AMBARI-14352. Should show error message when "Pause Upgrade" failed. (Xi Wang via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/38a92b7f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/38a92b7f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/38a92b7f
Branch: refs/heads/branch-2.2
Commit: 38a92b7ff52a005467aecede087222f9e9df79c5
Parents: 8772ea0
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Sat Dec 12 23:54:03 2015 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Sat Dec 12 23:54:03 2015 -0800
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 2 ++
ambari-web/app/messages.js | 2 ++
.../admin/stack_and_upgrade_controller_test.js | 30 ++++++++++++++++----
3 files changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/38a92b7f/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index f77397b..dd8592a 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -1542,6 +1542,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
wizardControllerName: self.get('name'),
localdb: App.db.data
});
+ }).fail(function () {
+ return App.showAlertPopup(Em.I18n.t('admin.stackUpgrade.state.paused.fail.header'), Em.I18n.t('admin.stackUpgrade.state.paused.fail.body'));
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/38a92b7f/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1ad0f6a..b468f7d 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1549,6 +1549,8 @@ Em.I18n.translations = {
'admin.stackUpgrade.title': "Stack and Versions",
'admin.stackUpgrade.state.inProgress': "Upgrade in Progress",
'admin.stackUpgrade.state.paused': "Upgrade Paused",
+ 'admin.stackUpgrade.state.paused.fail.header': "Pause Upgrade failed",
+ 'admin.stackUpgrade.state.paused.fail.body': "Upgrade cannot be paused, try other options.",
'admin.stackUpgrade.state.aborted': "Upgrade Aborted",
'admin.stackUpgrade.state.completed': "Upgrade Finished",
'admin.stackUpgrade.state.inProgress.downgrade': "Downgrade in Progress",
http://git-wip-us.apache.org/repos/asf/ambari/blob/38a92b7f/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index a9557cf..3611646 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -1333,11 +1333,6 @@ describe('App.MainAdminStackAndUpgradeController', function() {
describe("#suspendUpgrade()", function() {
beforeEach(function () {
- sinon.stub(controller, 'abortUpgrade').returns({
- done: function (callback) {
- callback();
- }
- });
sinon.stub(controller, 'setDBProperty', Em.K);
sinon.stub(App.clusterStatus, 'setClusterStatus', Em.K);
});
@@ -1346,13 +1341,36 @@ describe('App.MainAdminStackAndUpgradeController', function() {
controller.setDBProperty.restore();
App.clusterStatus.setClusterStatus.restore();
});
- it("", function() {
+ it("Suspend upgrade successfully", function() {
+ sinon.stub(controller, 'abortUpgrade').returns({
+ done: function (callback) {
+ callback();
+ return ({
+ fail: function () {}
+ })
+ }
+ });
controller.suspendUpgrade();
expect(controller.abortUpgrade.calledOnce).to.be.true;
expect(App.get('upgradeState')).to.equal('ABORTED');
expect(controller.setDBProperty.calledWith('upgradeState', 'ABORTED')).to.be.true;
expect(App.clusterStatus.setClusterStatus.calledOnce).to.be.true;
});
+ it("Suspend upgrade failed", function() {
+ sinon.stub(controller, 'abortUpgrade').returns({
+ done: function (callback) {
+ return ({
+ fail: function (callback) {
+ callback();
+ }
+ })
+ }
+ });
+ controller.suspendUpgrade();
+ expect(controller.abortUpgrade.calledOnce).to.be.true;
+ expect(controller.setDBProperty.calledWith('upgradeState', 'ABORTED')).to.be.false;
+ expect(App.clusterStatus.setClusterStatus.calledOnce).to.be.false;
+ });
});
describe("#resumeUpgrade()", function() {