ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] AMBARI-6484. HBase RegionServer -Xmn must be configurable (azwaw via aonishuk)
Date Mon, 28 Jul 2014 12:11:21 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 0ab80fdeb -> 4099da326


http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
index b2c57bd..3a54dcb 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
@@ -49,7 +49,17 @@
   <property>
     <name>hbase_regionserver_heapsize</name>
     <value>1024</value>
-    <description>Log Directories for HBase.</description>
+    <description>RegionServers heap size.</description>
+  </property>
+  <property>
+    <name>hbase_regionserver_xmn_max</name>
+    <value>512</value>
+    <description>HBase RegionServer maximum value for minimum heap size.</description>
+  </property>
+  <property>
+    <name>hbase_regionserver_xmn_ratio</name>
+    <value>0.2</value>
+    <description>HBase RegionServer minimum heap size is calculated as a percentage
of max heap size.</description>
   </property>
   <property>
     <name>hbase_master_heapsize</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
index b1b845a..f8797e8 100644
--- a/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
+++ b/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
@@ -218,6 +218,8 @@
         "webhcat_user" : "hcat",
         "regionserver_handlers" : "30",
         "hbase_regionserver_heapsize" : "1024m",
+        "hbase_regionserver_xmn_max": "512",
+        "hbase_regionserver_xmn_ratio": "0.2",
         "dfs_include" : "dfs.include",
         "dfs_webhdfs_enabled" : "false",
         "scheduler_name" : "org.apache.hadoop.mapred.CapacityTaskScheduler",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/configurations/cluster_level_configs.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/configurations/cluster_level_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
index faca624..55fa834 100644
--- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json
+++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
@@ -533,6 +533,8 @@
         "webhcat_user" : "hcat",
         "regionserver_handlers" : "30",
         "hbase_regionserver_heapsize" : "1024m",
+        "hbase_regionserver_xmn_max": "512",
+        "hbase_regionserver_xmn_ratio": "0.2",
         "dfs_include" : "dfs.include",
         "dfs_webhdfs_enabled" : "false",
         "scheduler_name" : "org.apache.hadoop.mapred.CapacityTaskScheduler",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json b/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
index 524d08a..dcbd692 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
@@ -376,7 +376,7 @@
     {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_heapsize",
       "StackConfigurations" : {
-        "property_description" : "Log Directories for HBase.",
+        "property_description" : "RegionServers heap size.",
         "property_name" : "hbase_regionserver_heapsize",
         "property_value" : "1024",
         "service_name" : "HBASE",
@@ -386,6 +386,30 @@
       }
     },
     {
+      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_max",
+      "StackConfigurations" : {
+        "property_description" : "Maximum value for minimum RegionServers Java heap size",
+        "property_name" : "hbase_regionserver_xmn_max",
+        "property_value" : "512",
+        "service_name" : "HBASE",
+        "stack_name" : "HDP",
+        "stack_version" : "1.3.0",
+        "type" : "global.xml"
+      }
+    },
+    {
+      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_ratio",
+      "StackConfigurations" : {
+        "property_description" : "RegionServers -Xmn is calculated as a percentage of -Xmx",
+        "property_name" : "hbase_regionserver_xmn_ratio",
+        "property_value" : "0.2",
+        "service_name" : "HBASE",
+        "stack_name" : "HDP",
+        "stack_version" : "1.3.0",
+        "type" : "global.xml"
+      }
+    },
+    {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_user",
       "StackConfigurations" : {
         "property_description" : "HBase User Name.",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/global.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/global.json b/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/global.json
index 0c37a17..f28bf61 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/global.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/global.json
@@ -916,6 +916,26 @@
           }
         },
         {
+          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_max",
+          "StackConfigurations" : {
+            "stack_version" : "1.3.0",
+            "property_name" : "hbase_regionserver_xmn_max",
+            "filename" : "global.xml",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP"
+          }
+        },
+        {
+          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_ratio",
+          "StackConfigurations" : {
+            "stack_version" : "1.3.0",
+            "property_name" : "hbase_regionserver_xmn_ratio",
+            "filename" : "global.xml",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP"
+          }
+        },
+        {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/client_scannercaching",
           "StackConfigurations" : {
             "stack_version" : "1.3.0",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/wizard/stack/hdp/version131/HBASE.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version131/HBASE.json b/ambari-web/app/assets/data/wizard/stack/hdp/version131/HBASE.json
index 6b0b607..4283809 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version131/HBASE.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version131/HBASE.json
@@ -148,7 +148,7 @@
     {
       "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_heapsize",
       "StackConfigurations" : {
-        "property_description" : "Log Directories for HBase.",
+        "property_description" : "RegionServers HeapSize.",
         "property_value" : "1024",
         "stack_version" : "1.3.1",
         "property_name" : "hbase_regionserver_heapsize",
@@ -158,6 +158,30 @@
       }
     },
     {
+      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_max",
+      "StackConfigurations" : {
+        "property_description" : "Maximum value for minimum RegionServers Java heap size",
+        "property_name" : "hbase_regionserver_xmn_max",
+        "property_value" : "512",
+        "service_name" : "HBASE",
+        "stack_name" : "HDP",
+        "stack_version" : "1.3.1",
+        "type" : "global.xml"
+      }
+    },
+    {
+      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_ratio",
+      "StackConfigurations" : {
+        "property_description" : "RegionServers -Xmn is calculated as a percentage of -Xmx",
+        "property_name" : "hbase_regionserver_xmn_ratio",
+        "property_value" : "0.2",
+        "service_name" : "HBASE",
+        "stack_name" : "HDP",
+        "stack_version" : "1.3.1",
+        "type" : "global.xml"
+      }
+    },
+    {
       "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hregion_majorcompaction",
       "StackConfigurations" : {
         "property_description" : "HBase Major Compaction.",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/wizard/stack/hdp/version131/global.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version131/global.json b/ambari-web/app/assets/data/wizard/stack/hdp/version131/global.json
index fee0938..24b4add 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version131/global.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version131/global.json
@@ -916,6 +916,26 @@
           }
         },
         {
+          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_max",
+          "StackConfigurations" : {
+            "stack_version" : "1.3.1",
+            "property_name" : "hbase_regionserver_xmn_max",
+            "filename" : "global.xml",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP"
+          }
+        },
+        {
+          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_ratio",
+          "StackConfigurations" : {
+            "stack_version" : "1.3.1",
+            "property_name" : "hbase_regionserver_xmn_ratio",
+            "filename" : "global.xml",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP"
+          }
+        },
+        {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/client_scannercaching",
           "StackConfigurations" : {
             "stack_version" : "1.3.1",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HBASE.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HBASE.json b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HBASE.json
index c7431e8..07b2db6 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HBASE.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HBASE.json
@@ -376,7 +376,7 @@
     {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/HBASE/configurations/hbase_regionserver_heapsize",
       "StackConfigurations" : {
-        "property_description" : "Log Directories for HBase.",
+        "property_description" : "RegionServers heap size.",
         "property_name" : "hbase_regionserver_heapsize",
         "property_value" : "1024",
         "service_name" : "HBASE",
@@ -386,6 +386,30 @@
       }
     },
     {
+      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/HBASE/configurations/hbase_regionserver_xmn_max",
+      "StackConfigurations" : {
+        "property_description" : "Maximum value for minimum RegionServers Java heap size",
+        "property_name" : "hbase_regionserver_xmn_max",
+        "property_value" : "512",
+        "service_name" : "HBASE",
+        "stack_name" : "HDP",
+        "stack_version" : "2.0.1",
+        "type" : "global.xml"
+      }
+    },
+    {
+      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/HBASE/configurations/hbase_regionserver_xmn_ratio",
+      "StackConfigurations" : {
+        "property_description" : "RegionServers -Xmn is calculated as a percentage of -Xmx",
+        "property_name" : "hbase_regionserver_xmn_ratio",
+        "property_value" : "0.2",
+        "service_name" : "HBASE",
+        "stack_name" : "HDP",
+        "stack_version" : "2.0.1",
+        "type" : "global.xml"
+      }
+    },
+    {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/HBASE/configurations/hbase_user",
       "StackConfigurations" : {
         "property_description" : "HBase User Name.",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json
index 0c37a17..f28bf61 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json
@@ -916,6 +916,26 @@
           }
         },
         {
+          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_max",
+          "StackConfigurations" : {
+            "stack_version" : "1.3.0",
+            "property_name" : "hbase_regionserver_xmn_max",
+            "filename" : "global.xml",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP"
+          }
+        },
+        {
+          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_ratio",
+          "StackConfigurations" : {
+            "stack_version" : "1.3.0",
+            "property_name" : "hbase_regionserver_xmn_ratio",
+            "filename" : "global.xml",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP"
+          }
+        },
+        {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/client_scannercaching",
           "StackConfigurations" : {
             "stack_version" : "1.3.0",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/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 26595c8..fb24dd8 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2073,6 +2073,27 @@ module.exports =
       "index": 1
     },
     {
+     "id": "puppet var",
+     "name": "hbase_regionserver_xmn_max",
+     "displayName": "RegionServers maximum value for -Xmn",
+     "displayType": "int",
+     "unit": "MB",
+     "isVisible": true,
+     "serviceName": "HBASE",
+     "category": "HBASE_REGIONSERVER",
+     "index": 6
+    },
+    {
+      "id": "puppet var",
+      "name": "hbase_regionserver_xmn_ratio",
+      "displayName": "RegionServers -Xmn in -Xmx ratio",
+      "displayType": "float",
+      "isVisible": true,
+      "serviceName": "HBASE",
+      "category": "HBASE_REGIONSERVER",
+      "index": 7
+    },
+    {
       "id": "puppet var",
       "name": "hbase_log_dir",
       "displayName": "HBase Log Dir",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/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 303e97e..d1b88f3 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -1342,6 +1342,29 @@ module.exports =
     },
     {
       "id": "puppet var",
+      "name": "hbase_regionserver_xmn_max",
+      "displayName": "RegionServers maximum value for -Xmn",
+      "displayType": "int",
+      "unit": "MB",
+      "isVisible": true,
+      "domain": "regionserver-global",
+      "serviceName": "HBASE",
+      "category": "HBASE_REGIONSERVER",
+      "index": 6
+    },
+    {
+      "id": "puppet var",
+      "name": "hbase_regionserver_xmn_ratio",
+      "displayName": "RegionServers Xmn is in percentage of Xmx",
+      "displayType": "float",
+      "isVisible": true,
+      "domain": "regionserver-global",
+      "serviceName": "HBASE",
+      "category": "HBASE_REGIONSERVER",
+      "index": 7
+    },
+    {
+      "id": "puppet var",
       "name": "hbase_log_dir",
       "displayName": "HBase Log Dir",
       "description": "Directory for HBase logs",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json b/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json
index 721751b..46c5f45 100644
--- a/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json
+++ b/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json
@@ -148,6 +148,8 @@
           "ganglia_server_port" : "8663",
           "hbase_master_heapsize" : "1024m",
           "hbase_regionserver_heapsize" : "1024m",
+          "hbase_regionserver_xmn_size" : "512",
+          "hbase_regionserver_xmn_ratio" : "0.2",
           "security_enabled" : "false",
           "user_group" : "hadoop"
         },

http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json
index 68fef3c..19e3479 100644
--- a/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json
+++ b/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json
@@ -425,6 +425,8 @@
         "site.global.ganglia_server_port" : "8667",
         "site.global.hbase_master_heapsize" : "1024m",
         "site.global.hbase_regionserver_heapsize" : "1024m",
+        "site.global.hbase_regionserver_xmn_size" : "512",
+        "site.global.hbase_regionserver_xmn_ratio" : "0.2",
         "site.global.security_enabled" : "false",
         "site.global.user_group" : "hadoop",
         "site.hbase-site.hbase.client.keyvalue.maxsize" : "10485760",


Mime
View raw message