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/10/27 21:58:04 UTC
[1/2] ambari git commit: AMBARI-13573. Express Upgrade: UI - Disallow
Downgrade when performing upgrade from HDP 2.1 -> 2.3.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 92cde3d22 -> 85689e3a5
AMBARI-13573. Express Upgrade: UI - Disallow Downgrade when performing upgrade from HDP 2.1 -> 2.3.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85689e3a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85689e3a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85689e3a
Branch: refs/heads/trunk
Commit: 85689e3a5ca9b666753497aaf0760967f1761f82
Parents: d3eb8a8
Author: Xi Wang <xi...@apache.org>
Authored: Mon Oct 26 16:57:21 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Tue Oct 27 11:56:17 2015 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/global/cluster_controller.js | 3 ++-
.../main/admin/stack_and_upgrade_controller.js | 10 +++++++++-
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../views/main/admin/stack_upgrade/upgrade_wizard_view.js | 4 ++--
.../main/admin/stack_upgrade/upgrade_wizard_view_test.js | 2 ++
5 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/85689e3a/ambari-web/app/controllers/global/cluster_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js
index 4c3d1bb..fbed2f1 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -307,7 +307,8 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, {
upgradeId: lastUpgradeData.Upgrade.request_id,
isDowngrade: lastUpgradeData.Upgrade.direction === 'DOWNGRADE',
upgradeState: lastUpgradeData.Upgrade.request_status,
- upgradeType: lastUpgradeData.Upgrade.upgrade_type
+ upgradeType: lastUpgradeData.Upgrade.upgrade_type,
+ downgradeAllowed: lastUpgradeData.Upgrade.downgrade_allowed
});
upgradeController.loadRepoVersionsToModel().done(function () {
upgradeController.setDBProperty('upgradeVersion', App.RepositoryVersion.find().findProperty('repositoryVersion', lastUpgradeData.Upgrade.to_version).get('displayName'));
http://git-wip-us.apache.org/repos/asf/ambari/blob/85689e3a/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 3b54778..a8a9853 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
@@ -52,6 +52,12 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
upgradeType: null,
/**
+ * @type {boolean}
+ * @default null
+ */
+ downgradeAllowed: null,
+
+ /**
* @type {string}
* @default null
*/
@@ -125,6 +131,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
'upgradeType',
'failuresTolerance',
'isDowngrade',
+ 'downgradeAllowed',
'isSuspended'
],
@@ -1142,7 +1149,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
upgradeTypeDisplayName: undefined,
upgradeType: undefined,
failuresTolerance: undefined,
- isDowngrade: undefined
+ isDowngrade: undefined,
+ downgradeAllowed: undefined
});
App.clusterStatus.setClusterStatus({
localdb: App.db.data
http://git-wip-us.apache.org/repos/asf/ambari/blob/85689e3a/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index d1fa528..411b3f0 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1291,7 +1291,7 @@ var urls = {
'mock': '/data/clusters/info.json'
},
'cluster.load_last_upgrade': {
- 'real': '/clusters/{clusterName}/upgrades?fields=Upgrade/request_status,Upgrade/request_id,Upgrade/to_version,Upgrade/direction,Upgrade/upgrade_type',
+ 'real': '/clusters/{clusterName}/upgrades?fields=Upgrade/request_status,Upgrade/request_id,Upgrade/to_version,Upgrade/direction,Upgrade/upgrade_type,Upgrade/downgrade_allowed',
'mock': '/data/stack_versions/upgrades.json'
},
'cluster.update_upgrade_version': {
http://git-wip-us.apache.org/repos/asf/ambari/blob/85689e3a/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 d1bfe18..aff8f94 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
@@ -69,8 +69,8 @@ App.upgradeWizardView = Em.View.extend({
* @type {boolean}
*/
isDowngradeAvailable: function () {
- return !this.get('controller.isDowngrade');
- }.property('controller.isDowngrade'),
+ return !this.get('controller.isDowngrade') && this.get('controller.downgradeAllowed');
+ }.property('controller.isDowngrade', 'controller.downgradeAllowed'),
/**
* progress value is rounded to floor
http://git-wip-us.apache.org/repos/asf/ambari/blob/85689e3a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
index 5a35d59..d75c3c6 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
@@ -381,11 +381,13 @@ describe('App.upgradeWizardView', function () {
describe("#isDowngradeAvailable", function () {
it("downgrade available", function () {
view.set('controller.isDowngrade', false);
+ view.set('controller.downgradeAllowed', true);
view.propertyDidChange('isDowngradeAvailable');
expect(view.get('isDowngradeAvailable')).to.be.true;
});
it("downgrade unavailable", function () {
view.set('controller.isDowngrade', true);
+ view.set('controller.downgradeAllowed', true);
view.propertyDidChange('isDowngradeAvailable');
expect(view.get('isDowngradeAvailable')).to.be.false;
});
[2/2] ambari git commit: AMBARI-13571. Upgrade: downgrade API
invocation needs to specify the type.(xiwang)
Posted by xi...@apache.org.
AMBARI-13571. Upgrade: downgrade API invocation needs to specify the type.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3eb8a8e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3eb8a8e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3eb8a8e
Branch: refs/heads/trunk
Commit: d3eb8a8ee621221edc10ffae685f664c9b97be08
Parents: 92cde3d
Author: Xi Wang <xi...@apache.org>
Authored: Mon Oct 26 16:19:48 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Tue Oct 27 11:56:17 2015 -0700
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 3 ++-
ambari-web/app/utils/ajax/ajax.js | 3 ++-
.../main/admin/stack_and_upgrade_controller_test.js | 10 ++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3eb8a8e/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 21f6164..3b54778 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
@@ -462,7 +462,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
from: App.RepositoryVersion.find().findProperty('displayName', this.get('upgradeVersion')).get('repositoryVersion'),
value: currentVersion.repository_version,
label: currentVersion.repository_name,
- isDowngrade: true
+ isDowngrade: true,
+ upgradeType: this.get('upgradeType')
},
success: 'upgradeSuccessCallback',
callback: function() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3eb8a8e/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index f845381..d1fa528 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1633,7 +1633,8 @@ var urls = {
},
"Upgrade": {
"from_version": data.from,
- "repository_version": data.value
+ "repository_version": data.value,
+ "upgrade_type": data.upgradeType
}
})
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3eb8a8e/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 56bf0f7..2c15790 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
@@ -533,7 +533,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
}),
Em.Object.create({
displayName: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.title'),
- type: 'NON-ROLLING'
+ type: 'NON_ROLLING'
})
];
controller.upgradeSuccessCallback(data, {}, {label: 'HDP-2.2.1', isDowngrade: true});
@@ -788,7 +788,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
}),
Em.Object.create({
displayName: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.title'),
- type: 'NON-ROLLING',
+ type: 'NON_ROLLING',
icon: "icon-bolt",
description: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.description'),
selected: false,
@@ -843,16 +843,18 @@ describe('App.MainAdminStackAndUpgradeController', function() {
});
it("make ajax call", function() {
controller.set('upgradeVersion', 'HDP-2.3');
+ controller.set('upgradeType', 'NON_ROLLING');
controller.downgrade(Em.Object.create({
repository_version: '2.2',
repository_name: 'HDP-2.2'
}), {context: 'context'});
expect(controller.abortUpgrade.calledOnce).to.be.true;
expect(App.ajax.send.getCall(0).args[0].data).to.eql({
+ from: '2.3',
value: '2.2',
label: 'HDP-2.2',
- from: '2.3',
- isDowngrade: true
+ isDowngrade: true,
+ upgradeType: "NON_ROLLING"
});
expect(App.ajax.send.getCall(0).args[0].name).to.eql('admin.downgrade.start');
expect(App.ajax.send.getCall(0).args[0].sender).to.eql(controller);