You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/07/06 22:29:14 UTC
ambari git commit: Revert "AMBARI-12224. Ambari should not configure
hbase.regionserver.global.memstore.upperLimit in HDP-2.3 (mpapyrovskiy via
dlysnichenko)"
Repository: ambari
Updated Branches:
refs/heads/trunk 2a253c056 -> 113d6565d
Revert "AMBARI-12224. Ambari should not configure hbase.regionserver.global.memstore.upperLimit in HDP-2.3 (mpapyrovskiy via dlysnichenko)"
This reverts commit 3fb3c48a62c61f1b6e8ba43dcac6fd925914b730.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/113d6565
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/113d6565
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/113d6565
Branch: refs/heads/trunk
Commit: 113d6565d67c1f5d2531e1eac468fb897e798e9e
Parents: 2a253c0
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Jul 6 16:28:57 2015 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Jul 6 16:28:57 2015 -0400
----------------------------------------------------------------------
.../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, 6 insertions(+), 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/113d6565/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
deleted file mode 100644
index 2920956..0000000
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/HBaseConfigCalculation.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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/113d6565/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 7a5732b..53da86d 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.upperLimit",
+ "config": "hbase-site/hbase.regionserver.global.memstore.size",
"subsection-name": "subsection-hbase-memory-col1"
},
{
@@ -266,7 +266,7 @@
}
},
{
- "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+ "config": "hbase-site/hbase.regionserver.global.memstore.size",
"widget": {
"type": "slider",
"units": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/113d6565/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 61c30d7..c5fb156 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,18 +687,6 @@
<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/113d6565/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 34dff85..12cd44b 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,15 +39,5 @@
<name>hbase.regionserver.info.port</name>
<value>16030</value>
<description>The port for the HBase RegionServer web UI.</description>
- </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>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/113d6565/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 a2690f4..921a225 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,13 +61,6 @@
</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/113d6565/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
deleted file mode 100644
index af66a3e..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/themes/theme.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "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/113d6565/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 a29d671..1808809 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.upperLimit",
+ "config": "hbase-site/hbase.regionserver.global.memstore.size",
"subsection-name": "subsection-hbase-memory-col1"
},
{
@@ -239,7 +239,7 @@
}
},
{
- "config": "hbase-site/hbase.regionserver.global.memstore.upperLimit",
+ "config": "hbase-site/hbase.regionserver.global.memstore.size",
"widget": {
"type": "slider",
"units": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/113d6565/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 2939836..43f872a 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,15 +39,5 @@
<name>hbase.regionserver.info.port</name>
<value>16030</value>
<description>The port for the HBase RegionServer web UI.</description>
- </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>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/113d6565/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 ba9e2f9..aa169df 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,13 +21,6 @@
<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/113d6565/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
deleted file mode 100644
index af66a3e..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/themes/theme.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "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