You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/03/04 18:07:10 UTC
ambari git commit: AMBARI-9925. Kerberos Wizard: Step 6. Timedout
task continue pending(onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b48782707 -> dbbecdf92
AMBARI-9925. Kerberos Wizard: Step 6. Timedout task continue pending(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dbbecdf9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dbbecdf9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dbbecdf9
Branch: refs/heads/trunk
Commit: dbbecdf92fc65ebb6cb14b6e7884b5bf7946a24c
Parents: b487827
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Wed Mar 4 18:41:23 2015 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Mar 4 18:41:23 2015 +0200
----------------------------------------------------------------------
.../app/mixins/wizard/wizardProgressPageController.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dbbecdf9/ambari-web/app/mixins/wizard/wizardProgressPageController.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/wizardProgressPageController.js b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
index d7ab5c2..561637c 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -36,6 +36,11 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({
isSubmitDisabled: true,
isBackButtonDisabled: true,
stages: [],
+ /**
+ * List of statuses that inform about the end of request progress.
+ * @type {String[]}
+ */
+ completedStatuses: ['COMPLETED', 'FAILED', 'TIMEDOUT', 'ABORTED'],
currentPageRequestId: null,
isSingleRequestPage: false,
isCommandLevelRetry: function () {
@@ -207,12 +212,12 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({
+ tasksInCurrentStage.filterProperty('Tasks.status', 'TIMEDOUT').length;
var queuedActions = tasksInCurrentStage.filterProperty('Tasks.status', 'QUEUED').length;
var inProgressActions = tasksInCurrentStage.filterProperty('Tasks.status', 'IN_PROGRESS').length;
- var progress = completedActions == this.get('tasks.length') ? 100 : Math.floor(((queuedActions * 0.09) + (inProgressActions * 0.35) + completedActions ) / tasksInCurrentStage.length * 100);
+ var progress = Math.floor(((queuedActions * 0.09) + (inProgressActions * 0.35) + completedActions ) / tasksInCurrentStage.length * 100);
this.get('tasks').findProperty('id', currentTaskId).set('progress', progress);
}
- // start polling if current step status not completed or failed
- if (!(this.get('status') === 'COMPLETED' && this.get('status') === 'FAILED')) {
+ // start polling if current request not completed
+ if (!(this.get('completedStatuses').contains(this.get('status')))) {
window.setTimeout(function () {
self.doPollingForPageRequest();
}, self.POLL_INTERVAL);