[18/39] git commit: AMBARI-7217. Ambari does not update ha.zookeeper.quorum property in core-site.xml file even if there are more than 3 ZooKeeper servers configured via Ambari.. (onechiporenko)

2014-09-10 Thread jonathanhurley 
AMBARI-7217. Ambari does not update ha.zookeeper.quorum property in 
core-site.xml file even if there are more than 3 ZooKeeper servers configured 
via Ambari.. (onechiporenko)


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

Branch: refs/heads/branch-alerts-dev
Commit: daae69ebac0ac72a71cf9c8b7d744aaea5aa6d56
Parents: 0e3fd88
Author: Oleg Nechiporenko 
Authored: Tue Sep 9 16:03:54 2014 +0300
Committer: Oleg Nechiporenko 
Committed: Tue Sep 9 16:03:54 2014 +0300

--
 ambari-web/app/controllers/main/host/details.js | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/daae69eb/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 911e5c2..a9b7d76 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -564,7 +564,11 @@ App.MainHostDetailsController = Em.Controller.extend({
   checkZkConfigs: function () {
 var bg = 
App.router.get('backgroundOperationsController.services').findProperty('id', 
this.get('zkRequestId'));
 if (bg && !bg.get('isRunning')) {
-  this.loadConfigs();
+  var self = this;
+  
this.removeObserver('App.router.backgroundOperationsController.serviceTimestamp',
 this, this.checkZkConfigs);
+  setTimeout(function () {
+self.loadConfigs();
+  }, App.get('componentsUpdateInterval'));
 }
   },
 
@@ -573,7 +577,6 @@ App.MainHostDetailsController = Em.Controller.extend({
* @method loadConfigs
*/
   loadConfigs: function () {
-
this.removeObserver('App.router.backgroundOperationsController.serviceTimestamp',
 this, this.checkZkConfigs);
 App.ajax.send({
   name: 'config.tags',
   sender: this,

git commit: AMBARI-7217. Ambari does not update ha.zookeeper.quorum property in core-site.xml file even if there are more than 3 ZooKeeper servers configured via Ambari.. (onechiporenko)

2014-09-09 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 0e3fd88b8 -> daae69eba


AMBARI-7217. Ambari does not update ha.zookeeper.quorum property in 
core-site.xml file even if there are more than 3 ZooKeeper servers configured 
via Ambari.. (onechiporenko)


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

Branch: refs/heads/trunk
Commit: daae69ebac0ac72a71cf9c8b7d744aaea5aa6d56
Parents: 0e3fd88
Author: Oleg Nechiporenko 
Authored: Tue Sep 9 16:03:54 2014 +0300
Committer: Oleg Nechiporenko 
Committed: Tue Sep 9 16:03:54 2014 +0300

--
 ambari-web/app/controllers/main/host/details.js | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/daae69eb/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 911e5c2..a9b7d76 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -564,7 +564,11 @@ App.MainHostDetailsController = Em.Controller.extend({
   checkZkConfigs: function () {
 var bg = 
App.router.get('backgroundOperationsController.services').findProperty('id', 
this.get('zkRequestId'));
 if (bg && !bg.get('isRunning')) {
-  this.loadConfigs();
+  var self = this;
+  
this.removeObserver('App.router.backgroundOperationsController.serviceTimestamp',
 this, this.checkZkConfigs);
+  setTimeout(function () {
+self.loadConfigs();
+  }, App.get('componentsUpdateInterval'));
 }
   },
 
@@ -573,7 +577,6 @@ App.MainHostDetailsController = Em.Controller.extend({
* @method loadConfigs
*/
   loadConfigs: function () {
-
this.removeObserver('App.router.backgroundOperationsController.serviceTimestamp',
 this, this.checkZkConfigs);
 App.ajax.send({
   name: 'config.tags',
   sender: this,