ambari git commit: AMBARI-9774. Start and Test services at enable security shows 100% even though its not completed (onechiporenko)

2015-02-28 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 32fc073fb -> 71486fb4a


AMBARI-9774. Start and Test services at enable security shows 100% even though 
its not completed (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/71486fb4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/71486fb4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/71486fb4

Branch: refs/heads/trunk
Commit: 71486fb4a3450da9bf8d40cf88b32c3b06f420fb
Parents: 32fc073
Author: Oleg Nechiporenko 
Authored: Fri Feb 27 19:28:44 2015 +0200
Committer: Oleg Nechiporenko 
Committed: Sat Feb 28 13:27:37 2015 +0200

--
 ambari-web/app/mixins/wizard/wizardProgressPageController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/71486fb4/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 a5933cb..d7ab5c2 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -554,7 +554,7 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({
   + tasks.filterProperty('Tasks.status', 'TIMEDOUT').length;
 var queuedActions = tasks.filterProperty('Tasks.status', 
'QUEUED').length;
 var inProgressActions = tasks.filterProperty('Tasks.status', 
'IN_PROGRESS').length;
-var progress = Math.ceil(((queuedActions * 0.09) + (inProgressActions 
* 0.35) + completedActions ) / actionsPerHost * 100);
+var progress = Math.floor(((queuedActions * 0.09) + (inProgressActions 
* 0.35) + completedActions ) / actionsPerHost * 100);
 this.get('tasks').findProperty('id', currentTaskId).set('progress', 
progress);
 window.setTimeout(function () {
   self.doPolling();

ambari git commit: AMBARI-9774. Start and Test services at enable security shows 100% even though its not completed (onechiporenko)

2015-02-28 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 78433c19e -> 8d77bedcb


AMBARI-9774. Start and Test services at enable security shows 100% even though 
its not completed (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d77bedc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d77bedc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d77bedc

Branch: refs/heads/branch-2.0.0
Commit: 8d77bedcb3fa708f088dd2c66256bac35736a1a9
Parents: 78433c1
Author: Oleg Nechiporenko 
Authored: Fri Feb 27 19:30:27 2015 +0200
Committer: Oleg Nechiporenko 
Committed: Sat Feb 28 13:22:18 2015 +0200

--
 ambari-web/app/mixins/wizard/wizardProgressPageController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8d77bedc/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 a5933cb..d7ab5c2 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -554,7 +554,7 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({
   + tasks.filterProperty('Tasks.status', 'TIMEDOUT').length;
 var queuedActions = tasks.filterProperty('Tasks.status', 
'QUEUED').length;
 var inProgressActions = tasks.filterProperty('Tasks.status', 
'IN_PROGRESS').length;
-var progress = Math.ceil(((queuedActions * 0.09) + (inProgressActions 
* 0.35) + completedActions ) / actionsPerHost * 100);
+var progress = Math.floor(((queuedActions * 0.09) + (inProgressActions 
* 0.35) + completedActions ) / actionsPerHost * 100);
 this.get('tasks').findProperty('id', currentTaskId).set('progress', 
progress);
 window.setTimeout(function () {
   self.doPolling();

ambari git commit: AMBARI-9774. Start and Test services at enable security shows 100% even though its not completed (onechiporenko)

2015-02-24 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk a5c7e2e7f -> af900c70d


AMBARI-9774. Start and Test services at enable security shows 100% even though 
its not completed (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af900c70
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af900c70
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af900c70

Branch: refs/heads/trunk
Commit: af900c70d0a92c53cd7c24fd3fc7f7426e35259a
Parents: a5c7e2e
Author: Oleg Nechiporenko 
Authored: Tue Feb 24 19:54:20 2015 +0200
Committer: Oleg Nechiporenko 
Committed: Tue Feb 24 19:54:20 2015 +0200

--
 ambari-web/app/mixins/wizard/wizardProgressPageController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/af900c70/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 e273ca4..6b7d9f0 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -203,7 +203,7 @@ 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 = Math.ceil(((queuedActions * 0.09) + (inProgressActions * 
0.35) + completedActions ) / tasksInCurrentStage.length * 100);
+  var progress = completedActions == this.get('tasks.length') ? 100 : 
Math.floor(((queuedActions * 0.09) + (inProgressActions * 0.35) + 
completedActions ) / tasksInCurrentStage.length * 100);
   this.get('tasks').findProperty('id', currentTaskId).set('progress', 
progress);
 }

ambari git commit: AMBARI-9774. Start and Test services at enable security shows 100% even though its not completed (onechiporenko)

2015-02-24 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 c556bb7b9 -> fd2abedb0


AMBARI-9774. Start and Test services at enable security shows 100% even though 
its not completed (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd2abedb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd2abedb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd2abedb

Branch: refs/heads/branch-2.0.0
Commit: fd2abedb082fc1e5591f5a44fdf13963ce41653e
Parents: c556bb7
Author: Oleg Nechiporenko 
Authored: Tue Feb 24 19:55:26 2015 +0200
Committer: Oleg Nechiporenko 
Committed: Tue Feb 24 19:55:26 2015 +0200

--
 ambari-web/app/mixins/wizard/wizardProgressPageController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fd2abedb/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 e273ca4..6b7d9f0 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -203,7 +203,7 @@ 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 = Math.ceil(((queuedActions * 0.09) + (inProgressActions * 
0.35) + completedActions ) / tasksInCurrentStage.length * 100);
+  var progress = completedActions == this.get('tasks.length') ? 100 : 
Math.floor(((queuedActions * 0.09) + (inProgressActions * 0.35) + 
completedActions ) / tasksInCurrentStage.length * 100);
   this.get('tasks').findProperty('id', currentTaskId).set('progress', 
progress);
 }