You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/07/02 17:46:57 UTC

[1/2] ambari git commit: AMBARI-12224. Ambari should not configure hbase.regionserver.global.memstore.upperLimit in HDP-2.3 (mpapyrovskiy via dlysnichenko)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 85fd7a5e4 -> 0aae22bb9
  refs/heads/trunk f52b0a12a -> 3fb3c48a6


AMBARI-12224. Ambari should not configure hbase.regionserver.global.memstore.upperLimit in HDP-2.3 (mpapyrovskiy via dlysnichenko)


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

Branch: refs/heads/branch-2.1
Commit: 0aae22bb918ba4493aa786f0f20a4cb8f004d406
Parents: 85fd7a5
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Jul 2 17:51:43 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Jul 2 18:40:40 2015 +0300

----------------------------------------------------------------------
 .../upgrades/HBaseConfigCalculation.java        | 67 ++++++++++++++++++++
 .../HDP/2.2/services/HBASE/themes/theme.json    |  4 +-
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml     | 12 ++++
 .../services/HBASE/configuration/hbase-site.xml | 12 +++-
 .../stacks/HDP/2.3/services/HBASE/metainfo.xml  |  7 ++
 .../HDP/2.3/services/HBASE/themes/theme.json    | 33 ++++++++++
 .../HDPWIN/2.2/services/HBASE/themes/theme.json |  4 +-
 .../services/HBASE/configuration/hbase-site.xml | 12 +++-
 .../HDPWIN/2.3/services/HBASE/metainfo.xml      |  7 ++
 .../HDPWIN/2.3/services/HBASE/themes/theme.json | 33 ++++++++++
 10 files changed, 185 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java
new file mode 100644
index 0000000..2920956
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.serveraction.upgrades;
+
+import com.google.inject.Inject;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.serveraction.AbstractServerAction;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+
+import java.math.BigDecimal;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+public class HBaseConfigCalculation extends AbstractServerAction {
+
+  @Inject
+  Clusters clusters;
+
+  @Override
+  public CommandReport execute(ConcurrentMap<String, Object> requestSharedDataContext) throws AmbariException, InterruptedException {
+    StringBuilder stdout = new StringBuilder();
+    String clusterName = getExecutionCommand().getClusterName();
+
+    Cluster cluster = clusters.getCluster(clusterName);
+
+    Config config = cluster.getDesiredConfigByType("hbase-site");
+
+    Map<String, String> properties = config.getProperties();
+    String upperLimitStr = properties.get("hbase.regionserver.global.memstore.upperLimit");
+    String lowerLimitStr = properties.get("hbase.regionserver.global.memstore.lowerLimit");
+
+    BigDecimal upperLimit = new BigDecimal(upperLimitStr);
+    BigDecimal lowerLimit = new BigDecimal(lowerLimitStr);
+    if (lowerLimit.scale() < 2) //make sure result will have at least 2 digits after decimal point
+      lowerLimit = lowerLimit.setScale(2, BigDecimal.ROUND_HALF_UP);
+    BigDecimal lowerLimitNew = lowerLimit.divide(upperLimit, BigDecimal.ROUND_HALF_UP);
+
+    properties.put("hbase.regionserver.global.memstore.size.lower.limit", lowerLimitNew.toString());
+    stdout.append("hbase.regionserver.global.memstore.size.lower.limit was set to ").append(lowerLimitNew);
+
+    config.setProperties(properties);
+    config.persist(false);
+
+    return createCommandReport(0, HostRoleStatus.COMPLETED, "{}", stdout.toString(), "");
+
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
index 53da86d..7a5732b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
@@ -170,7 +170,7 @@
           "subsection-name": "subsection-hbase-memory-col1"
         },
         {
-          "config": "hbase-site/hbase.regionserver.global.memstore.size",
+          "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
           "subsection-name": "subsection-hbase-memory-col1"
         },
         {
@@ -266,7 +266,7 @@
         }
       },
       {
-        "config": "hbase-site/hbase.regionserver.global.memstore.size",
+        "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
         "widget": {
           "type": "slider",
           "units": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index c5fb156..61c30d7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -687,6 +687,18 @@
             <replace key="hbase.coprocessor.master.classes" find="com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor" replace-with="org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor" />
             <replace key="hbase.coprocessor.region.classes" find="com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor" replace-with="org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor" />           
           </task>
+
+          <task xsi:type="configure">
+            <transfer operation="copy" from-type="hbase-site" from-key="hbase.regionserver.global.memstore.upperLimit" to-key="base.regionserver.global.memstore.size" default-value="0.4" />
+          </task>
+
+          <task xsi:type="server_action" summary="Calculating HBase Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
+
+          <task xsi:type="configure">
+            <type>hbase-site</type>
+            <transfer operation="delete" delete-key="hbase.regionserver.global.memstore.upperLimit"/>
+            <transfer operation="delete" delete-key="hbase.regionserver.global.memstore.lowerLimit"/>
+          </task>
           
           <task xsi:type="configure" summary="Transitioning Ranger HBase Policy">
             <type>ranger-hbase-policymgr-ssl</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
index 12cd44b..34dff85 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
@@ -39,5 +39,15 @@
     <name>hbase.regionserver.info.port</name>
     <value>16030</value>
     <description>The port for the HBase RegionServer web UI.</description>
-  </property> 
+  </property>
+  <property>
+    <name>hbase.regionserver.global.memstore.upperLimit</name>
+    <value>0.4</value>
+    <deleted>true</deleted>
+  </property>
+  <property>
+    <name>hbase.regionserver.global.memstore.lowerLimit</name>
+    <value>0.38</value>
+    <deleted>true</deleted>
+  </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
index 921a225..a2690f4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
@@ -61,6 +61,13 @@
         </osSpecific>
       </osSpecifics>
 
+      <themes>
+        <theme>
+          <fileName>theme.json</fileName>
+          <default>true</default>
+        </theme>
+      </themes>
+
     </service>
   </services>
 </metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json
new file mode 100644
index 0000000..af66a3e
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json
@@ -0,0 +1,33 @@
+{
+  "configuration" : {
+    "placement" : {
+      "configs" : [
+        {
+          "config": "hbase-site/hbase.regionserver.global.memstore.size",
+          "subsection-name": "subsection-hbase-memory-col1"
+        },
+        {
+          "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+          "subsection-name": null
+        }
+      ]
+    },
+    "widgets" : [
+      {
+        "config": "hbase-site/hbase.regionserver.global.memstore.size",
+        "widget": {
+          "type": "slider",
+          "units": [
+            {
+              "unit-name": "percent"
+            }
+          ]
+        }
+      },
+      {
+        "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+        "widget": null
+      }
+    ]
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json
index 1808809..a29d671 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json
@@ -151,7 +151,7 @@
           "subsection-name": "subsection-hbase-memory-col1"
         },
         {
-          "config": "hbase-site/hbase.regionserver.global.memstore.size",
+          "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
           "subsection-name": "subsection-hbase-memory-col1"
         },
         {
@@ -239,7 +239,7 @@
         }
       },
       {
-        "config": "hbase-site/hbase.regionserver.global.memstore.size",
+        "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
         "widget": {
           "type": "slider",
           "units": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml
index 43f872a..2939836 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml
@@ -39,5 +39,15 @@
     <name>hbase.regionserver.info.port</name>
     <value>16030</value>
     <description>The port for the HBase RegionServer web UI.</description>
-  </property> 
+  </property>
+  <property>
+    <name>hbase.regionserver.global.memstore.upperLimit</name>
+    <value>0.4</value>
+    <deleted>true</deleted>
+  </property>
+  <property>
+    <name>hbase.regionserver.global.memstore.lowerLimit</name>
+    <value>0.38</value>
+    <deleted>true</deleted>
+  </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml
index aa169df..ba9e2f9 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml
@@ -21,6 +21,13 @@
     <service>
       <name>HBASE</name>
       <version>1.1.0.2.3</version>
+
+      <themes>
+        <theme>
+          <fileName>theme.json</fileName>
+          <default>true</default>
+        </theme>
+      </themes>
     </service>
   </services>
 </metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aae22bb/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json
new file mode 100644
index 0000000..af66a3e
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json
@@ -0,0 +1,33 @@
+{
+  "configuration" : {
+    "placement" : {
+      "configs" : [
+        {
+          "config": "hbase-site/hbase.regionserver.global.memstore.size",
+          "subsection-name": "subsection-hbase-memory-col1"
+        },
+        {
+          "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+          "subsection-name": null
+        }
+      ]
+    },
+    "widgets" : [
+      {
+        "config": "hbase-site/hbase.regionserver.global.memstore.size",
+        "widget": {
+          "type": "slider",
+          "units": [
+            {
+              "unit-name": "percent"
+            }
+          ]
+        }
+      },
+      {
+        "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+        "widget": null
+      }
+    ]
+  }
+}
\ No newline at end of file


[2/2] ambari git commit: AMBARI-12224. Ambari should not configure hbase.regionserver.global.memstore.upperLimit in HDP-2.3 (mpapyrovskiy via dlysnichenko)

Posted by dm...@apache.org.
AMBARI-12224. Ambari should not configure hbase.regionserver.global.memstore.upperLimit in HDP-2.3 (mpapyrovskiy via dlysnichenko)


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

Branch: refs/heads/trunk
Commit: 3fb3c48a62c61f1b6e8ba43dcac6fd925914b730
Parents: f52b0a1
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Jul 2 17:51:43 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Jul 2 18:46:25 2015 +0300

----------------------------------------------------------------------
 .../upgrades/HBaseConfigCalculation.java        | 67 ++++++++++++++++++++
 .../HDP/2.2/services/HBASE/themes/theme.json    |  4 +-
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml     | 12 ++++
 .../services/HBASE/configuration/hbase-site.xml | 12 +++-
 .../stacks/HDP/2.3/services/HBASE/metainfo.xml  |  7 ++
 .../HDP/2.3/services/HBASE/themes/theme.json    | 33 ++++++++++
 .../HDPWIN/2.2/services/HBASE/themes/theme.json |  4 +-
 .../services/HBASE/configuration/hbase-site.xml | 12 +++-
 .../HDPWIN/2.3/services/HBASE/metainfo.xml      |  7 ++
 .../HDPWIN/2.3/services/HBASE/themes/theme.json | 33 ++++++++++
 10 files changed, 185 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java
new file mode 100644
index 0000000..2920956
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.serveraction.upgrades;
+
+import com.google.inject.Inject;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.serveraction.AbstractServerAction;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+
+import java.math.BigDecimal;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+public class HBaseConfigCalculation extends AbstractServerAction {
+
+  @Inject
+  Clusters clusters;
+
+  @Override
+  public CommandReport execute(ConcurrentMap<String, Object> requestSharedDataContext) throws AmbariException, InterruptedException {
+    StringBuilder stdout = new StringBuilder();
+    String clusterName = getExecutionCommand().getClusterName();
+
+    Cluster cluster = clusters.getCluster(clusterName);
+
+    Config config = cluster.getDesiredConfigByType("hbase-site");
+
+    Map<String, String> properties = config.getProperties();
+    String upperLimitStr = properties.get("hbase.regionserver.global.memstore.upperLimit");
+    String lowerLimitStr = properties.get("hbase.regionserver.global.memstore.lowerLimit");
+
+    BigDecimal upperLimit = new BigDecimal(upperLimitStr);
+    BigDecimal lowerLimit = new BigDecimal(lowerLimitStr);
+    if (lowerLimit.scale() < 2) //make sure result will have at least 2 digits after decimal point
+      lowerLimit = lowerLimit.setScale(2, BigDecimal.ROUND_HALF_UP);
+    BigDecimal lowerLimitNew = lowerLimit.divide(upperLimit, BigDecimal.ROUND_HALF_UP);
+
+    properties.put("hbase.regionserver.global.memstore.size.lower.limit", lowerLimitNew.toString());
+    stdout.append("hbase.regionserver.global.memstore.size.lower.limit was set to ").append(lowerLimitNew);
+
+    config.setProperties(properties);
+    config.persist(false);
+
+    return createCommandReport(0, HostRoleStatus.COMPLETED, "{}", stdout.toString(), "");
+
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
index 53da86d..7a5732b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
@@ -170,7 +170,7 @@
           "subsection-name": "subsection-hbase-memory-col1"
         },
         {
-          "config": "hbase-site/hbase.regionserver.global.memstore.size",
+          "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
           "subsection-name": "subsection-hbase-memory-col1"
         },
         {
@@ -266,7 +266,7 @@
         }
       },
       {
-        "config": "hbase-site/hbase.regionserver.global.memstore.size",
+        "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
         "widget": {
           "type": "slider",
           "units": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index c5fb156..61c30d7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -687,6 +687,18 @@
             <replace key="hbase.coprocessor.master.classes" find="com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor" replace-with="org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor" />
             <replace key="hbase.coprocessor.region.classes" find="com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor" replace-with="org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor" />           
           </task>
+
+          <task xsi:type="configure">
+            <transfer operation="copy" from-type="hbase-site" from-key="hbase.regionserver.global.memstore.upperLimit" to-key="base.regionserver.global.memstore.size" default-value="0.4" />
+          </task>
+
+          <task xsi:type="server_action" summary="Calculating HBase Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
+
+          <task xsi:type="configure">
+            <type>hbase-site</type>
+            <transfer operation="delete" delete-key="hbase.regionserver.global.memstore.upperLimit"/>
+            <transfer operation="delete" delete-key="hbase.regionserver.global.memstore.lowerLimit"/>
+          </task>
           
           <task xsi:type="configure" summary="Transitioning Ranger HBase Policy">
             <type>ranger-hbase-policymgr-ssl</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
index 12cd44b..34dff85 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
@@ -39,5 +39,15 @@
     <name>hbase.regionserver.info.port</name>
     <value>16030</value>
     <description>The port for the HBase RegionServer web UI.</description>
-  </property> 
+  </property>
+  <property>
+    <name>hbase.regionserver.global.memstore.upperLimit</name>
+    <value>0.4</value>
+    <deleted>true</deleted>
+  </property>
+  <property>
+    <name>hbase.regionserver.global.memstore.lowerLimit</name>
+    <value>0.38</value>
+    <deleted>true</deleted>
+  </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
index 921a225..a2690f4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
@@ -61,6 +61,13 @@
         </osSpecific>
       </osSpecifics>
 
+      <themes>
+        <theme>
+          <fileName>theme.json</fileName>
+          <default>true</default>
+        </theme>
+      </themes>
+
     </service>
   </services>
 </metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json
new file mode 100644
index 0000000..af66a3e
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json
@@ -0,0 +1,33 @@
+{
+  "configuration" : {
+    "placement" : {
+      "configs" : [
+        {
+          "config": "hbase-site/hbase.regionserver.global.memstore.size",
+          "subsection-name": "subsection-hbase-memory-col1"
+        },
+        {
+          "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+          "subsection-name": null
+        }
+      ]
+    },
+    "widgets" : [
+      {
+        "config": "hbase-site/hbase.regionserver.global.memstore.size",
+        "widget": {
+          "type": "slider",
+          "units": [
+            {
+              "unit-name": "percent"
+            }
+          ]
+        }
+      },
+      {
+        "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+        "widget": null
+      }
+    ]
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json
index 1808809..a29d671 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/themes/theme.json
@@ -151,7 +151,7 @@
           "subsection-name": "subsection-hbase-memory-col1"
         },
         {
-          "config": "hbase-site/hbase.regionserver.global.memstore.size",
+          "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
           "subsection-name": "subsection-hbase-memory-col1"
         },
         {
@@ -239,7 +239,7 @@
         }
       },
       {
-        "config": "hbase-site/hbase.regionserver.global.memstore.size",
+        "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
         "widget": {
           "type": "slider",
           "units": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml
index 43f872a..2939836 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml
@@ -39,5 +39,15 @@
     <name>hbase.regionserver.info.port</name>
     <value>16030</value>
     <description>The port for the HBase RegionServer web UI.</description>
-  </property> 
+  </property>
+  <property>
+    <name>hbase.regionserver.global.memstore.upperLimit</name>
+    <value>0.4</value>
+    <deleted>true</deleted>
+  </property>
+  <property>
+    <name>hbase.regionserver.global.memstore.lowerLimit</name>
+    <value>0.38</value>
+    <deleted>true</deleted>
+  </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml
index aa169df..ba9e2f9 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/metainfo.xml
@@ -21,6 +21,13 @@
     <service>
       <name>HBASE</name>
       <version>1.1.0.2.3</version>
+
+      <themes>
+        <theme>
+          <fileName>theme.json</fileName>
+          <default>true</default>
+        </theme>
+      </themes>
     </service>
   </services>
 </metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fb3c48a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json
new file mode 100644
index 0000000..af66a3e
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json
@@ -0,0 +1,33 @@
+{
+  "configuration" : {
+    "placement" : {
+      "configs" : [
+        {
+          "config": "hbase-site/hbase.regionserver.global.memstore.size",
+          "subsection-name": "subsection-hbase-memory-col1"
+        },
+        {
+          "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+          "subsection-name": null
+        }
+      ]
+    },
+    "widgets" : [
+      {
+        "config": "hbase-site/hbase.regionserver.global.memstore.size",
+        "widget": {
+          "type": "slider",
+          "units": [
+            {
+              "unit-name": "percent"
+            }
+          ]
+        }
+      },
+      {
+        "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+        "widget": null
+      }
+    ]
+  }
+}
\ No newline at end of file