Pārlūkot izejas kodu

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

atkach 10 gadi atpakaļ
vecāks
revīzija
ad71f0bf71

+ 0 - 6
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml

@@ -318,12 +318,6 @@ limitations under the License.
     </description>
   </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>

+ 2 - 2
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>

+ 0 - 6
ambari-web/app/models/service_config.js

@@ -498,12 +498,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));