AMBARI-6021. Hive ports are not configurable (aonishuk)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml

@@ -53,12 +53,7 @@
     <value></value>
     <type>PASSWORD</type>
     <description>Database password to use to connect to the database.</description>
-  </property>    
-  <property>
-    <name>hive_metastore_port</name>
-    <value>9083</value>
-    <description>Hive Metastore port.</description>
-  </property>    
+  </property>
   <property>
     <name>hive_lib</name>
     <value>/usr/lib/hive/lib/</value>

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hive-site.xml

@@ -255,4 +255,12 @@ limitations under the License.
     </description>
   </property>
 
+  <property>
+    <name>hive.server2.thrift.port</name>
+    <value>10000</value>
+    <description>
+      TCP port number to listen on, default 10000.
+    </description>
+  </property>
+
 </configuration>

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py

@@ -49,11 +49,11 @@ check_db_connection_jar_name = "DBConnectionVerification.jar"
 check_db_connection_jar = format("/usr/lib/ambari-agent/{check_db_connection_jar_name}")
 
 #common
-hive_metastore_port = config['configurations']['global']['hive_metastore_port']
+hive_metastore_port = get_port_from_url(config['configurations']['hive-site']['hive.metastore.uris']) #"9083"
 hive_var_lib = '/var/lib/hive'
 ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0]
 hive_server_host = config['clusterHostInfo']['hive_server_host'][0]
-hive_server_port = 10000
+hive_server_port = default('/configurations/hive-site/hive.server2.thrift.port',"10000")
 hive_url = format("jdbc:hive2://{hive_server_host}:{hive_server_port}")
 
 smokeuser = config['configurations']['global']['smokeuser']
@@ -118,7 +118,6 @@ mysql_adduser_path = "/tmp/addMysqlUser.sh"
 
 hcat_conf_dir = '/etc/hcatalog/conf'
 
-metastore_port = 9933
 hcat_lib = '/usr/lib/hcatalog/share/hcatalog'
 
 hcat_dbroot = hcat_lib

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hcat-env.sh.j2

@@ -41,4 +41,4 @@ HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
 #DBROOT is the path where the connector jars are downloaded
 DBROOT={{hcat_dbroot}}
 USER={{hcat_user}}
-METASTORE_PORT={{metastore_port}}
+METASTORE_PORT={{hive_metastore_port}}

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2

@@ -75,3 +75,4 @@ if [ "${HIVE_AUX_JARS_PATH}" != "" ]; then
 else
   export HIVE_AUX_JARS_PATH={{hive_aux_jars_path}}
 fi
+export METASTORE_PORT={{hive_metastore_port}}

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py

@@ -60,8 +60,8 @@ hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.h
 journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.journalnode.http-address'])
 datanode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.datanode.http.address'])
 flume_port = "4159"
-hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
-hive_server_port = "10000"
+hive_metastore_port = get_port_from_url(config['configurations']['hive-site']['hive.metastore.uris']) #"9083"
+hive_server_port = default('/configurations/hive-site/hive.server2.thrift.port',"10000")
 templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"
 hbase_master_port = config['configurations']['hbase-site']['hbase.master.info.port'] #"60010"
 hbase_rs_port = config['configurations']['hbase-site']['hbase.regionserver.info.port'] #"60030"

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml

@@ -53,12 +53,7 @@
     <value></value>
     <type>PASSWORD</type>
     <description>Database password to use to connect to the database.</description>
-  </property>    
-  <property>
-    <name>hive_metastore_port</name>
-    <value>9083</value>
-    <description>Hive Metastore port.</description>
-  </property>    
+  </property>
   <property>
     <name>hive_lib</name>
     <value>/usr/lib/hive/lib/</value>

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

@@ -289,4 +289,12 @@ limitations under the License.
     </description>
   </property>
 
+  <property>
+    <name>hive.server2.thrift.port</name>
+    <value>10000</value>
+    <description>
+      TCP port number to listen on, default 10000.
+    </description>
+  </property>
+
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py

@@ -51,12 +51,12 @@ check_db_connection_jar = format("/usr/lib/ambari-agent/{check_db_connection_jar
 
 #common
 hdp_stack_version = config['hostLevelParams']['stack_version']
-hive_metastore_port = config['configurations']['global']['hive_metastore_port']
+hive_metastore_port = get_port_from_url(config['configurations']['hive-site']['hive.metastore.uris']) #"9083"
 hive_var_lib = '/var/lib/hive'
 ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0]
 hive_bin = '/usr/lib/hive/bin'
 hive_server_host = config['clusterHostInfo']['hive_server_host'][0]
-hive_server_port = 10000
+hive_server_port = default('/configurations/hive-site/hive.server2.thrift.port',"10000")
 hive_url = format("jdbc:hive2://{hive_server_host}:{hive_server_port}")
 
 smokeuser = config['configurations']['global']['smokeuser']
@@ -134,8 +134,6 @@ else:
   hcat_lib = '/usr/lib/hive-hcatalog/share/hcatalog'
 
 
-metastore_port = 9933
-
 hcat_dbroot = hcat_lib
 
 hcat_user = config['configurations']['global']['hcat_user']

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hcat-env.sh.j2

@@ -40,4 +40,4 @@ HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
 #DBROOT is the path where the connector jars are downloaded
 DBROOT={{hcat_dbroot}}
 USER={{hcat_user}}
-METASTORE_PORT={{metastore_port}}
+METASTORE_PORT={{hive_metastore_port}}

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2

@@ -76,4 +76,4 @@ elif [ -d "/usr/lib/hive-hcatalog/" ]; then
 else
   export HIVE_AUX_JARS_PATH=/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar
 fi
-
+export METASTORE_PORT={{hive_metastore_port}}

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py

@@ -61,8 +61,8 @@ hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.j
 journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.journalnode.http-address'])
 datanode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.datanode.http.address'])
 flume_port = "4159"
-hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
-hive_server_port = "10000"
+hive_metastore_port = get_port_from_url(config['configurations']['hive-site']['hive.metastore.uris']) #"9083"
+hive_server_port = default('/configurations/hive-site/hive.server2.thrift.port',"10000")
 templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"
 hbase_master_port = config['configurations']['hbase-site']['hbase.master.info.port'] #"60010"
 hbase_rs_port = config['configurations']['hbase-site']['hbase.regionserver.info.port'] #"60030"

ambari-web/app/data/HDP2/site_properties.js

@@ -490,6 +490,19 @@ module.exports =
       "serviceName": "HIVE",
       "category": "Advanced"
     },
+    {
+      "id": "site property",
+      "name": "hive.server2.thrift.port",
+      "displayName": "Hive Server Port",
+      "description": "TCP port number to listen on, default 10000.",
+      "defaultValue": "10000",
+      "displayType": "int",
+      "isReconfigurable": true,
+      "isOverridable": false,
+      "isVisible": true,
+      "category": "Advanced",
+      "serviceName": "HIVE"
+    },
   /**********************************************tez-site*****************************************/
     {
       "id": "site property",

ambari-web/app/data/site_properties.js

@@ -493,7 +493,19 @@ module.exports =
       "category": "Hive Metastore",
       "index": 4
     },
-
+    {
+      "id": "site property",
+      "name": "hive.server2.thrift.port",
+      "displayName": "Hive Server Port",
+      "description": "TCP port number to listen on, default 10000.",
+      "defaultValue": "10000",
+      "displayType": "int",
+      "isReconfigurable": true,
+      "isOverridable": false,
+      "isVisible": true,
+      "category": "Advanced",
+      "serviceName": "HIVE"
+    },
   /**********************************************hbase-site***************************************/
     {
       "id": "site property",