ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-6001. hbase.master.port not set by default and exposed thru API/UI (aonishuk)
Date Tue, 03 Jun 2014 13:08:44 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 6f416e39e -> b0dc16843


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


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

Branch: refs/heads/trunk
Commit: b0dc168433e92439f1deb7e5f1f94375cd51c158
Parents: 6f416e3
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Jun 3 16:08:23 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Jun 3 16:08:23 2014 +0300

----------------------------------------------------------------------
 22201                                                    |  7 +++++++
 .../1.3.2/services/HBASE/configuration/hbase-site.xml    |  5 +++++
 .../HDP/1.3.2/services/NAGIOS/package/scripts/params.py  |  2 +-
 .../2.0.6/services/HBASE/configuration/hbase-site.xml    |  5 +++++
 .../HDP/2.0.6/services/NAGIOS/package/scripts/params.py  |  2 +-
 .../python/stacks/1.3.2/configs/default.hbasedecom.json  |  3 ++-
 .../src/test/python/stacks/1.3.2/configs/default.json    |  3 ++-
 .../stacks/1.3.2/configs/default.non_gmetad_host.json    |  3 ++-
 .../src/test/python/stacks/1.3.2/configs/secured.json    |  3 ++-
 .../python/stacks/1.3.2/configs/secured_no_jce_name.json |  3 ++-
 .../python/stacks/2.0.6/configs/default.hbasedecom.json  |  3 ++-
 .../src/test/python/stacks/2.0.6/configs/default.json    |  3 ++-
 .../stacks/2.0.6/configs/default.non_gmetad_host.json    |  3 ++-
 .../test/python/stacks/2.0.6/configs/flume_target.json   |  3 ++-
 .../src/test/python/stacks/2.0.6/configs/secured.json    |  3 ++-
 .../python/stacks/2.0.6/configs/secured_no_jce_name.json |  3 ++-
 ambari-web/app/data/HDP2/site_properties.js              | 11 +++++++++++
 ambari-web/app/data/site_properties.js                   | 11 +++++++++++
 18 files changed, 63 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/22201
----------------------------------------------------------------------
diff --git a/22201 b/22201
new file mode 100644
index 0000000..7f5c0b1
--- /dev/null
+++ b/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"
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/hbase-site.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/hbase-site.xml
index 1d19188..11c5b95 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/hbase-site.xml
@@ -43,6 +43,11 @@
     </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>
     <description>Temporary directory on the local filesystem.

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
index 806aefe..df31305 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
+++ b/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'])

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/hbase-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/hbase-site.xml
index b2af1fb..a9711d3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/hbase-site.xml
@@ -43,6 +43,11 @@
     </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>
     <description>Temporary directory on the local filesystem.

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
index 1610cee..3dfe61a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
+++ b/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'])

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
index 8732c0b..27b487f 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
index a56eeba..6630cf2 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
b/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
index 376b59d..17fae68 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
index c0a345e..7d4b758 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json
index 677a759..0a36a75 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
index 553cc59..cec663c 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 099984f..7caa590 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
index 51908f4..7295979 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
index a50b24a..d311afd 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 829606b..34b521b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
index a4d46ae..9cc17e4 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index b08ef76..d86d01d 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -583,6 +583,17 @@ module.exports =
 
     },
     {
+    "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",
       "displayName": "hbase.regionserver.global.memstore.upperLimit",

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dc1684/ambari-web/app/data/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js
index 8c1f7c3..2c6ee54 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -510,6 +510,17 @@ module.exports =
     },
     {
       "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",
       "displayName": "hbase.regionserver.global.memstore.upperLimit",
       "description": "",


Mime
View raw message