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 2015/10/09 15:08:17 UTC

ambari git commit: AMBARI-13371 Unable to add Nimbus components when HDFS or YARN is HA enabled. (atkach)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 c06a8ab75 -> f30cb70bf


AMBARI-13371 Unable to add Nimbus components when HDFS or YARN is HA enabled. (atkach)


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

Branch: refs/heads/branch-2.1
Commit: f30cb70bfeb516a6c784f801233be4cdd4cfdb5b
Parents: c06a8ab
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Fri Oct 9 15:16:57 2015 +0300
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Fri Oct 9 16:08:06 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/f30cb70b/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 5a48dfa..c49705a 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -1282,7 +1282,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
    */
   setZKConfigs: function (configs, zksWithPort, zks) {
     if (typeof configs !== 'object' || !Array.isArray(zks)) return false;
-    if (App.get('isHaEnabled')) {
+    if (App.get('isHaEnabled') && configs['core-site']) {
       App.config.updateHostsListValue(configs['core-site'], 'ha.zookeeper.quorum', zksWithPort);
     }
     if (configs['hbase-site']) {
@@ -1300,7 +1300,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
     if (configs['storm-site']) {
       configs['storm-site']['storm.zookeeper.servers'] = JSON.stringify(zks).replace(/"/g, "'");
     }
-    if (App.get('isRMHaEnabled')) {
+    if (App.get('isRMHaEnabled') && configs['yarn-site']) {
       App.config.updateHostsListValue(configs['yarn-site'], 'yarn.resourcemanager.zk-address', zksWithPort);
     }
     if (App.get('isHadoop22Stack')) {