You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2016/02/03 15:52:22 UTC
ambari git commit: AMBARI-14897 Rolling Upgrade: upgrade group status
not updated. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 2551d9f08 -> fb8e9aa9c
AMBARI-14897 Rolling Upgrade: upgrade group status not updated. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb8e9aa9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb8e9aa9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb8e9aa9
Branch: refs/heads/branch-2.2
Commit: fb8e9aa9c2bbef36c5010394066304dafba82bfc
Parents: 2551d9f
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Wed Feb 3 12:38:51 2016 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Wed Feb 3 12:38:51 2016 +0200
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 2 ++
ambari-web/app/models/upgrade_entity.js | 2 +-
.../main/admin/stack_and_upgrade_controller_test.js | 10 ++++++++++
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb8e9aa9/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 93a4f58..61645d4 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
@@ -384,10 +384,12 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
//update existed entities with new data
oldData.upgradeGroups.forEach(function (oldGroup) {
oldGroup.set('status', groupsMap[oldGroup.get('group_id')].status);
+ oldGroup.set('display_status', groupsMap[oldGroup.get('group_id')].display_status);
oldGroup.set('progress_percent', groupsMap[oldGroup.get('group_id')].progress_percent);
oldGroup.set('completed_task_count', groupsMap[oldGroup.get('group_id')].completed_task_count);
oldGroup.upgradeItems.forEach(function (item) {
item.set('status', itemsMap[item.get('stage_id')].status);
+ item.set('display_status', itemsMap[item.get('stage_id')].display_status);
item.set('progress_percent', itemsMap[item.get('stage_id')].progress_percent);
});
var hasExpandableItems = oldGroup.upgradeItems.some(function (item) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb8e9aa9/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 4cbb66d..ab91a03 100644
--- a/ambari-web/app/models/upgrade_entity.js
+++ b/ambari-web/app/models/upgrade_entity.js
@@ -93,5 +93,5 @@ App.upgradeEntity = Em.Object.extend({
if (this.get('type') === 'GROUP') {
return !this.get('isActive') && this.get('hasExpandableItems') ? 'SUBITEM_FAILED' : this.get('display_status') || this.get('status');
}
- }.property('isExpandableGroup')
+ }.property('isExpandableGroup', 'display_status', 'status')
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb8e9aa9/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..13b89d1 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
@@ -613,6 +613,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
UpgradeGroup: {
group_id: 1,
status: 'COMPLETED',
+ display_status: 'COMPLETED',
progress_percent: 100,
completed_task_count: 3
},
@@ -621,6 +622,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
UpgradeItem: {
stage_id: 1,
status: 'COMPLETED',
+ display_status: 'COMPLETED',
progress_percent: 100
}
}
@@ -630,6 +632,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
UpgradeGroup: {
group_id: 2,
status: 'ABORTED',
+ display_status: 'ABORTED',
progress_percent: 50,
completed_task_count: 1
},
@@ -638,6 +641,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
UpgradeItem: {
stage_id: 2,
status: 'ABORTED',
+ display_status: 'ABORTED',
progress_percent: 99
}
},
@@ -645,6 +649,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
UpgradeItem: {
stage_id: 3,
status: 'PENDING',
+ display_status: 'PENDING',
progress_percent: 0
}
}
@@ -655,16 +660,21 @@ describe('App.MainAdminStackAndUpgradeController', function() {
controller.set('upgradeData', oldData);
controller.updateUpgradeData(newData);
expect(controller.get('upgradeData.upgradeGroups')[0].get('status')).to.equal('COMPLETED');
+ expect(controller.get('upgradeData.upgradeGroups')[0].get('display_status')).to.equal('COMPLETED');
expect(controller.get('upgradeData.upgradeGroups')[0].get('progress_percent')).to.equal(100);
expect(controller.get('upgradeData.upgradeGroups')[0].get('completed_task_count')).to.equal(3);
expect(controller.get('upgradeData.upgradeGroups')[0].get('upgradeItems')[0].get('status')).to.equal('COMPLETED');
+ expect(controller.get('upgradeData.upgradeGroups')[0].get('upgradeItems')[0].get('display_status')).to.equal('COMPLETED');
expect(controller.get('upgradeData.upgradeGroups')[0].get('upgradeItems')[0].get('progress_percent')).to.equal(100);
expect(controller.get('upgradeData.upgradeGroups')[0].get('hasExpandableItems')).to.be.true;
expect(controller.get('upgradeData.upgradeGroups')[1].get('status')).to.equal('ABORTED');
+ expect(controller.get('upgradeData.upgradeGroups')[1].get('display_status')).to.equal('ABORTED');
expect(controller.get('upgradeData.upgradeGroups')[1].get('progress_percent')).to.equal(50);
expect(controller.get('upgradeData.upgradeGroups')[1].get('completed_task_count')).to.equal(1);
expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[0].get('status')).to.equal('ABORTED');
+ expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[0].get('display_status')).to.equal('ABORTED');
expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[1].get('status')).to.equal('PENDING');
+ expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[1].get('display_status')).to.equal('PENDING');
expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[0].get('progress_percent')).to.equal(99);
expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[1].get('progress_percent')).to.equal(0);
expect(controller.get('upgradeData.upgradeGroups')[1].get('hasExpandableItems')).to.be.false;