AMBARI-6001. hbase.master.port not set by default and exposed thru API/UI (aonishuk)

22201

@@ -0,0 +1,7 @@
+Usage: jira <action> <param>
+Options:
+  -h, --help            show this help message and exit
+  -b BRANCHES, --braches=BRANCHES
+                        space separted list of branch. E.g. -b="brach-1.6.0
+                        branch-1.7.0"
+

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/hbase-site.xml

@@ -42,6 +42,11 @@
       in the one JVM.
     </description>
   </property>
+  <property>
+    <name>hbase.master.port</name>
+    <value>60000</value>
+    <description>The port the HBase Master should bind to.</description>
+  </property>
   <property>
     <name>hbase.tmp.dir</name>
     <value>/hadoop/hbase</value>

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

@@ -55,7 +55,7 @@ namenode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.htt
 # different to HDP2  
 snamenode_port = get_port_from_url(config['configurations']['hdfs-site']["dfs.secondary.http.address"])
 
-hbase_master_rpc_port = "60000"
+hbase_master_rpc_port = default('/configurations/hbase-site/hbase.master.port', "60000")
 hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.history.server.http.address'])
 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'])

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/hbase-site.xml

@@ -42,6 +42,11 @@
       in the one JVM.
     </description>
   </property>
+  <property>
+    <name>hbase.master.port</name>
+    <value>60000</value>
+    <description>The port the HBase Master should bind to.</description>
+  </property>
   <property>
     <name>hbase.tmp.dir</name>
     <value>/hadoop/hbase</value>

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

@@ -54,7 +54,7 @@ namenode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.nam
 # different to HDP1  
 snamenode_port = get_port_from_url(config['configurations']['hdfs-site']["dfs.namenode.secondary.http-address"])
 
-hbase_master_rpc_port = "60000"
+hbase_master_rpc_port = default('/configurations/hbase-site/hbase.master.port', "60000")
 rm_port = get_port_from_url(config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'])
 nm_port = "8042"
 hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.jobhistory.webapp.address'])

ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json

@@ -284,7 +284,8 @@
             "hbase.security.authentication": "simple", 
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-unsecure", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "false", 
             "hbase.cluster.distributed": "true", 

ambari-server/src/test/python/stacks/1.3.2/configs/default.json

@@ -286,7 +286,8 @@
             "hbase.security.authentication": "simple", 
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-unsecure", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "false", 
             "hbase.cluster.distributed": "true", 

ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json

@@ -284,7 +284,8 @@
             "hbase.security.authentication": "simple", 
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-unsecure", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "false", 
             "hbase.cluster.distributed": "true", 

ambari-server/src/test/python/stacks/1.3.2/configs/secured.json

@@ -379,7 +379,8 @@
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-secure", 
             "hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "true", 
             "hbase.master.keytab.file": "/etc/security/keytabs/hbase.service.keytab", 

ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json

@@ -377,7 +377,8 @@
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-secure", 
             "hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "true", 
             "hbase.master.keytab.file": "/etc/security/keytabs/hbase.service.keytab", 

ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json

@@ -376,7 +376,8 @@
             "hbase.defaults.for.version.skip": "true", 
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org,c6402.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-unsecure", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "false", 
             "hbase.cluster.distributed": "true", 

ambari-server/src/test/python/stacks/2.0.6/configs/default.json

@@ -380,7 +380,8 @@
             "hbase.defaults.for.version.skip": "true", 
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org,c6402.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-unsecure", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "false", 
             "hbase.cluster.distributed": "true", 

ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json

@@ -377,7 +377,8 @@
             "hbase.defaults.for.version.skip": "true", 
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org,c6402.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-unsecure", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "false", 
             "hbase.cluster.distributed": "true", 

ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json

@@ -378,7 +378,8 @@
             "hbase.defaults.for.version.skip": "true", 
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org,c6402.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-unsecure", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "false", 
             "hbase.cluster.distributed": "true", 

ambari-server/src/test/python/stacks/2.0.6/configs/secured.json

@@ -492,7 +492,8 @@
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org,c6402.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-secure", 
             "hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "true", 
             "hbase.master.keytab.file": "/etc/security/keytabs/hbase.service.keytab", 

ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json

@@ -490,7 +490,8 @@
             "hbase.zookeeper.quorum": "c6401.ambari.apache.org,c6402.ambari.apache.org", 
             "zookeeper.znode.parent": "/hbase-secure", 
             "hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController", 
-            "hbase.hstore.blockingStoreFiles": "10", 
+            "hbase.hstore.blockingStoreFiles": "10",
+            "hbase.master.port": "60000",
             "hbase.hregion.majorcompaction": "86400000", 
             "hbase.security.authorization": "true", 
             "hbase.master.keytab.file": "/etc/security/keytabs/hbase.service.keytab", 

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

@@ -581,6 +581,17 @@ module.exports =
       "category": "Advanced",
       "serviceName": "HBASE"
 
+    },
+    {
+    "id": "site property",
+    "name": "hbase.master.port",
+    "displayName": "HBase Master Port",
+    "isReconfigurable": true,
+    "displayType": "int",
+    "isOverridable": false,
+    "isVisible": true,
+    "serviceName": "HBASE",
+    "category": "Advanced"
     },
     {
       "id": "site property",

ambari-web/app/data/site_properties.js

@@ -508,6 +508,17 @@ module.exports =
       "serviceName": "HBASE"
 
     },
+    {
+      "id": "site property",
+      "name": "hbase.master.port",
+      "displayName": "HBase Master Port",
+      "isReconfigurable": true,
+      "displayType": "int",
+      "isOverridable": false,
+      "isVisible": true,
+      "serviceName": "HBASE",
+      "category": "Advanced"
+    },
     {
       "id": "site property",
       "name": "hbase.regionserver.global.memstore.upperLimit",