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/09 23:33:48 UTC
ambari git commit: AMBARI-13802. Update message content for Finalize
Upgrade Pre-Check.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk d7a965535 -> 70f2cfe74
AMBARI-13802. Update message content for Finalize Upgrade Pre-Check.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70f2cfe7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70f2cfe7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70f2cfe7
Branch: refs/heads/trunk
Commit: 70f2cfe74bb54ce9579eb073c4348b179ce76ad1
Parents: d7a9655
Author: Xi Wang <xi...@apache.org>
Authored: Mon Nov 9 12:06:37 2015 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Mon Nov 9 14:33:14 2015 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 5 +++
.../stack_upgrade/stack_upgrade_wizard.hbs | 45 +++++++++++---------
.../admin/stack_upgrade/upgrade_wizard_view.js | 31 ++++++++++++++
3 files changed, 61 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/70f2cfe7/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 2cb7a97..d255877 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1500,6 +1500,11 @@ Em.I18n.translations = {
" <b>You cannot go back to the original version once the downgrade is finalized.</b>",
'admin.stackUpgrade.finalize.message.skippedServiceChecks': "During the upgrade, checks for the following services failed and were skipped:",
'admin.stackUpgrade.finalize.message.testServices': "You are strongly recommended to test these services before finalizing upgrade.",
+ 'admin.stackUpgrade.failedHosts.message': "Upgrade did not succeed on",
+ 'admin.stackUpgrade.failedHosts.showHosts': "{0} hosts",
+ 'admin.stackUpgrade.failedHosts.options': "Your options:",
+ 'admin.stackUpgrade.failedHosts.options.first': "<b>Pause Upgrade</b>, delete the unhealthy hosts and return to the Upgrade Wizard to Proceed.",
+ 'admin.stackUpgrade.failedHosts.options.second': "Perform a <b>Downgrade</b>, which will revert all hosts to the previous stack version.",
'admin.stackUpgrade.doThisLater': "Do This Later",
'admin.stackUpgrade.pauseUpgrade': "Pause Upgrade",
'admin.stackUpgrade.pauseDowngrade': "Pause Downgrade",
http://git-wip-us.apache.org/repos/asf/ambari/blob/70f2cfe7/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 92c735f..eeefbe1 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
@@ -92,20 +92,21 @@
<div class="box details-box">
<p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
<p><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p>
-
- {{#if areSlaveComponentFailuresHostsLoaded}}
- {{#if slaveComponentFailuresHosts.length}}
- <div>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.msg1}}</div>
- <ul class="failed-info-list">
- {{#each hostName in slaveComponentFailuresHosts}}
- <li>{{hostName}}</li>
- {{/each}}
- </ul>
- <div>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.msg2}}</div>
- {{/if}}
- {{else}}
+ <p>
+ {{#if areSlaveComponentFailuresHostsLoaded}}
+ {{t admin.stackUpgrade.failedHosts.message}}
+ <a href="#" {{action showFailedHosts target="view"}}>{{view.failedHostsMessage}}</a>
+ {{else}}
<div class="spinner"></div>
- {{/if}}
+ {{/if}}
+ </p>
+ <p>
+ {{t admin.stackUpgrade.failedHosts.options}}
+ <ul>
+ <li>{{t admin.stackUpgrade.failedHosts.options.first}}</li>
+ <li>{{t admin.stackUpgrade.failedHosts.options.second}}</li>
+ </ul>
+ </p>
<label class="message">
{{view Em.Checkbox checkedBinding="view.isManualDone"}}
@@ -143,13 +144,17 @@
{{/if}}
{{#if slaveComponentFailuresHosts.length}}
<p><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p>
- <div>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.msg1}}</div>
- <ul class="failed-info-list">
- {{#each hostName in slaveComponentFailuresHosts}}
- <li>{{hostName}}</li>
- {{/each}}
- </ul>
- <div>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.msg2}}</div>
+ <p>
+ {{t admin.stackUpgrade.failedHosts.message}}
+ <a href="#" {{action showFailedHosts target="view"}}>{{view.failedHostsMessage}}</a>
+ </p>
+ <p>
+ {{t admin.stackUpgrade.failedHosts.options}}
+ <ul>
+ <li>{{t admin.stackUpgrade.failedHosts.options.first}}</li>
+ <li>{{t admin.stackUpgrade.failedHosts.options.second}}</li>
+ </ul>
+ </p>
{{/if}}
{{else}}
<div class="spinner"></div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70f2cfe7/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
index a76a5af..7e6978a 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
@@ -470,5 +470,36 @@ App.upgradeWizardView = Em.View.extend({
pauseUpgrade: function() {
this.get('controller').suspendUpgrade();
this.get('parentView').closeWizard();
+ },
+
+ /**
+ * hosts failed to be upgraded
+ * @type {Array}
+ */
+ failedHosts: function() {
+ if (this.get('isSlaveComponentFailuresItem') && this.get('controller.areSlaveComponentFailuresHostsLoaded')) {
+ return this.get('controller.slaveComponentFailuresHosts');
+ }
+ if (this.get('isServiceCheckFailuresItem') && this.get('controller.areServiceCheckFailuresServicenamesLoaded')) {
+ return this.get('controller.slaveComponentFailuresHosts');
+ }
+ return [];
+ }.property('controller.areSlaveComponentFailuresHostsLoaded', 'isSlaveComponentFailuresItem',
+ 'isServiceCheckFailuresItem', 'controller.areServiceCheckFailuresServicenamesLoaded'),
+
+ /**
+ * @type {string}
+ */
+ failedHostsMessage: function() {
+ return Em.I18n.t('admin.stackUpgrade.failedHosts.showHosts').format(this.get('failedHosts.length'));
+ }.property('failedHosts'),
+
+ showFailedHosts: function() {
+ return App.ModalPopup.show({
+ content: this.get('failedHosts').join(", "),
+ header: Em.I18n.t('common.hosts'),
+ bodyClass: App.SelectablePopupBodyView,
+ secondary: null
+ });
}
});