You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/11/13 00:42:39 UTC
ambari git commit: AMBARI-13868. Not possible to pause upgrade if
Finalize Upgrade Pre-Check failed due MM host.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 b0f46e7f0 -> cc77797be
AMBARI-13868. Not possible to pause upgrade if Finalize Upgrade Pre-Check failed due MM host.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc77797b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc77797b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc77797b
Branch: refs/heads/branch-2.1
Commit: cc77797be2d645d1f1c798617eb837ab04204fdc
Parents: b0f46e7
Author: Xi Wang <xi...@apache.org>
Authored: Thu Nov 12 14:45:22 2015 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Thu Nov 12 14:45:32 2015 -0800
----------------------------------------------------------------------
ambari-web/app/models/upgrade_entity.js | 2 +-
.../templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc77797b/ambari-web/app/models/upgrade_entity.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/upgrade_entity.js b/ambari-web/app/models/upgrade_entity.js
index 1733154..ab9806a 100644
--- a/ambari-web/app/models/upgrade_entity.js
+++ b/ambari-web/app/models/upgrade_entity.js
@@ -87,7 +87,7 @@ App.upgradeEntity = Em.Object.extend({
return 'SUSPENDED';
}
if (this.get('type') === 'GROUP') {
- return !this.get('isActive') && this.get('hasExpandableItems') ? 'SUBITEM_FAILED' : this.get('status');
+ return !this.get('isActive') && this.get('hasExpandableItems') ? 'SUBITEM_FAILED' : this.get('display_status') || this.get('status');
}
}.property('isExpandableGroup', 'App.router.mainAdminStackAndUpgradeController.isSuspended')
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc77797b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index 1df2554..675ddcf 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -79,6 +79,11 @@
{{#if view.isDowngradeAvailable}}
<button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.failedItem target="controller"}}>{{t common.downgrade}}</button>
{{/if}}
+ {{#if isDowngrade}}
+ <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
+ {{else}}
+ <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
+ {{/if}}
{{#if view.failedItem.skippable}}
<button class="btn btn-warning" {{bindAttr disabled="controller.requestInProgress"}} {{action continue view.failedItem target="view"}}>{{t admin.stackUpgrade.dialog.continue}}</button>
{{/if}}