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/28 18:22:38 UTC
ambari git commit: AMBARI-22084. Upgrade Wizard Expand Details Does
Not Work (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 903829603 -> d195d966a
AMBARI-22084. Upgrade Wizard Expand Details Does Not Work (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d195d966
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d195d966
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d195d966
Branch: refs/heads/branch-2.6
Commit: d195d966ae7a3afb09be921669db01be4e809da1
Parents: 9038296
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Thu Sep 28 21:22:25 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Thu Sep 28 21:22:25 2017 +0300
----------------------------------------------------------------------
.../main/admin/stack_upgrade/upgrade_wizard_view.js | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d195d966/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 415d87d..89c54ce 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
@@ -394,22 +394,30 @@ App.upgradeWizardView = Em.View.extend({
},
/**
+ * previous item request
+ */
+ prevItemRequest: null,
+
+ /**
* poll for tasks when item is expanded
*/
doUpgradeItemPolling: function () {
var self = this;
var item = this.get('runningItem') || this.get('failedItem');
-
+ var request = this.get('prevItemRequest');
+ if ( request ) request.abort();
if (item && this.get('isDetailsOpened')) {
- this.get('controller').getUpgradeItem(item).complete(function () {
+ request = this.get('controller').getUpgradeItem(item).complete(function () {
self.set('upgradeItemTimer', setTimeout(function () {
self.doUpgradeItemPolling();
}, App.bgOperationsUpdateInterval));
});
+
+ this.set('prevItemRequest', request);
} else {
clearTimeout(this.get('upgradeItemTimer'));
}
- }.observes('isDetailsOpened'),
+ }.observes('isDetailsOpened', 'runningItem', 'failedItem'),
/**
* set current upgrade item state to FAILED (for HOLDING_FAILED) or TIMED_OUT (for HOLDING_TIMED_OUT)