You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/09/05 14:14:36 UTC
ambari git commit: AMBARI-21879. Cluster version showing as Upgrade
when INSTALL_FAILED (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 a6cfc132c -> 98ce22a09
AMBARI-21879. Cluster version showing as Upgrade when INSTALL_FAILED (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98ce22a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98ce22a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98ce22a0
Branch: refs/heads/branch-2.6
Commit: 98ce22a096463c980c72d556a71960a68db35cdc
Parents: a6cfc13
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Tue Sep 5 17:14:22 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Tue Sep 5 17:14:22 2017 +0300
----------------------------------------------------------------------
.../stack_upgrade/upgrade_version_box_view.js | 66 +++++++++++---------
.../upgrade_version_box_view_test.js | 34 ++--------
2 files changed, 43 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/98ce22a0/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index e36b83a..02c285e 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -256,39 +256,47 @@ App.UpgradeVersionBoxView = Em.View.extend({
if (Em.get(currentVersion, 'stack_name') !== this.get('content.stackVersionType') || isVersionHigherThanCurrent) {
var isDisabled = this.isDisabledOnInstalled();
- element.set('isButtonGroup', true);
- if (status === 'OUT_OF_SYNC') {
- element.set('text', this.get('isVersionColumnView') ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall'));
- element.set('action', 'installRepoVersionConfirmation');
- element.get('buttons').pushObject({
- text: this.get('isVersionColumnView') ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade'),
- action: 'confirmUpgrade',
- isDisabled: isDisabled
- });
- } else {
- var isVersionColumnView = this.get('isVersionColumnView');
- element.set('text', isVersionColumnView ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade'));
- element.set('action', 'confirmUpgrade');
- element.get('buttons').pushObject({
- text: isVersionColumnView ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall'),
- action: 'installRepoVersionConfirmation',
- isDisabled: isDisabled
- });
-
- element.get('buttons').pushObject({
- text: Em.I18n.t('admin.stackVersions.version.preUpgradeCheck'),
- action: 'showUpgradeOptions',
- isDisabled: isDisabled
- });
+ switch (status){
+ case 'OUT_OF_SYNC':
+ element.set('isButtonGroup', true);
+ element.set('text', this.get('isVersionColumnView') ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall'));
+ element.set('action', 'installRepoVersionConfirmation');
+ element.get('buttons').pushObject({
+ text: this.get('isVersionColumnView') ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade'),
+ action: 'confirmUpgrade',
+ isDisabled: isDisabled
+ });
+ break;
+ case 'INSTALL_FAILED':
+ element.set('isButton', true);
+ element.set('text', this.get('isVersionColumnView') ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall'));
+ element.set('action', 'installRepoVersionConfirmation');
+ break;
+ default:
+ var isVersionColumnView = this.get('isVersionColumnView');
+ element.set('isButtonGroup', true);
+ element.set('text', isVersionColumnView ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade'));
+ element.set('action', 'confirmUpgrade');
+ element.get('buttons').pushObject({
+ text: isVersionColumnView ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall'),
+ action: 'installRepoVersionConfirmation',
+ isDisabled: isDisabled
+ });
- if (this.get('content.isPatch')) {
element.get('buttons').pushObject({
- text: Em.I18n.t('common.discard'),
- action: 'confirmDiscardRepoVersion',
+ text: Em.I18n.t('admin.stackVersions.version.preUpgradeCheck'),
+ action: 'showUpgradeOptions',
isDisabled: isDisabled
});
- }
- this.addRemoveIopSelectButton(element, isDisabled);
+
+ if (this.get('content.isPatch')) {
+ element.get('buttons').pushObject({
+ text: Em.I18n.t('common.discard'),
+ action: 'confirmDiscardRepoVersion',
+ isDisabled: isDisabled
+ });
+ }
+ this.addRemoveIopSelectButton(element, isDisabled);
}
element.set('isDisabled', isDisabled);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/98ce22a0/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
index abcad21..8849604 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
@@ -462,20 +462,9 @@ describe('App.UpgradeVersionBoxView', function () {
},
expected: {
status: 'INSTALL_FAILED',
- isButtonGroup: true,
- buttons: [{
- text: Em.I18n.t('admin.stackVersions.version.reinstall'),
- action: 'installRepoVersionConfirmation',
- isDisabled: true
- },
- {
- text: Em.I18n.t('admin.stackVersions.version.preUpgradeCheck'),
- action: 'showUpgradeOptions',
- isDisabled: true
- }],
- text: Em.I18n.t('admin.stackVersions.version.performUpgrade'),
- action: 'confirmUpgrade',
- isDisabled: true
+ isButton: true,
+ text: Em.I18n.t('admin.stackVersions.version.reinstall'),
+ action: 'installRepoVersionConfirmation',
},
title: 'INSTALL_FAILED state, no admin access, request in progress, another installation running'
},
@@ -504,20 +493,9 @@ describe('App.UpgradeVersionBoxView', function () {
},
expected: {
status: 'INSTALL_FAILED',
- isButtonGroup: true,
- buttons: [{
- text: Em.I18n.t('admin.stackVersions.version.reinstall'),
- action: 'installRepoVersionConfirmation',
- isDisabled: true
- },
- {
- text: Em.I18n.t('admin.stackVersions.version.preUpgradeCheck'),
- action: 'showUpgradeOptions',
- isDisabled: true
- }],
- text: Em.I18n.t('admin.stackVersions.version.performUpgrade'),
- action: 'confirmUpgrade',
- isDisabled: true
+ isButton: true,
+ text: Em.I18n.t('admin.stackVersions.version.reinstall'),
+ action: 'installRepoVersionConfirmation',
},
title: 'INSTALL_FAILED state, no admin access, no requests in progress, another installation running'
},