ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-7972 Remove "required value" for hive.zookeeper.quorum property in hive-site, additional patch. (atkach)
Date Tue, 28 Oct 2014 14:44:41 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 14b916cdb -> d149029bb


AMBARI-7972 Remove "required value" for hive.zookeeper.quorum property in hive-site, additional
patch. (atkach)


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

Branch: refs/heads/branch-1.7.0
Commit: d149029bb0b386b092faff55049beb90505466fc
Parents: 14b916c
Author: atkach <atkach@hortonworks.com>
Authored: Tue Oct 28 16:44:22 2014 +0200
Committer: atkach <atkach@hortonworks.com>
Committed: Tue Oct 28 16:44:22 2014 +0200

----------------------------------------------------------------------
 .../stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml | 6 ------
 .../stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml   | 4 ++--
 ambari-web/app/models/service_config.js                        | 6 ------
 3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d149029b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml
index 117b026..44ff0a8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml
@@ -319,12 +319,6 @@ limitations under the License.
   </property>
 
   <property>
-    <name>hive.zookeeper.quorum</name>
-    <value>localhost:2181</value>
-    <description>ZooKeeper servers, as comma separated host:port pairs</description>
-  </property>
-
-  <property>
     <name>hive.server2.zookeeper.namespace</name>
     <value>hiveserver2</value>
     <description>The parent node in ZooKeeper used by HiveServer2 when

http://git-wip-us.apache.org/repos/asf/ambari/blob/d149029b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index 9acce78..abc17c5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -27,8 +27,8 @@ limitations under the License.
 
   <property>
     <name>hive.zookeeper.quorum</name>
-    <value></value>
-    <description>ZooKeeper servers to talk to.</description>
+    <value>localhost:2181</value>
+    <description>ZooKeeper servers, as comma separated host:port pairs</description>
   </property>
 
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d149029b/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 5454223..2d15301 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -501,12 +501,6 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'hadoop.registry.zk.quorum':
       case 'hive.cluster.delegation.token.store.zookeeper.connectString':
         var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
-        if (this.get('name') === 'hive.zookeeper.quorum') {
-          zkHosts = masterComponentHostsInDB.
-            filterProperty('component', 'ZOOKEEPER_SERVER').
-            filterProperty('workStatus', 'STARTED').
-            mapProperty('hostName');
-        }
         var zkHostPort = zkHosts;
         var regex = "\\w*:(\\d+)";   //regex to fetch the port
         var portValue = this.get('defaultValue').match(new RegExp(regex));


Mime
View raw message