You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/12/01 19:20:17 UTC
[27/50] ambari git commit: AMBARI-14113 Check memory consumption of
hbase shell jvm launched to verify data model (dsen)
AMBARI-14113 Check memory consumption of hbase shell jvm launched to verify data model (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edc8d14e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edc8d14e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edc8d14e
Branch: refs/heads/branch-dev-patch-upgrade
Commit: edc8d14ec38ad5c0c7a10c0576da60e60a670fb4
Parents: fd1181f
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Nov 30 21:12:37 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Nov 30 21:12:37 2015 +0200
----------------------------------------------------------------------
.../org/apache/ambari/server/upgrade/UpgradeCatalog213.java | 6 ++++++
.../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml | 4 ++--
.../apache/ambari/server/upgrade/UpgradeCatalog213Test.java | 6 ++++--
3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/edc8d14e/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index a070935..3b61fa1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -1187,6 +1187,12 @@ public class UpgradeCatalog213 extends AbstractUpgradeCatalog {
regSearch = "\\{\\{regionserver_heapsize\\}\\}";
replacement = "{{regionserver_heapsize}}m";
content = content.replaceAll(regSearch, replacement);
+ regSearch = "export HBASE_HEAPSIZE=";
+ replacement = "#export HBASE_HEAPSIZE=";
+ content = content.replaceAll(regSearch, replacement);
+ content += "\n" +
+ "# The maximum amount of heap to use for hbase shell.\n" +
+ "export HBASE_SHELL_OPTS=\"-Xmx256m\"\n";
return content;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edc8d14e/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index b36275b..33bd713 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -159,8 +159,8 @@ else
export HBASE_CLASSPATH=${HBASE_CLASSPATH}
fi
-# The maximum amount of heap to use, in MB. Default is 1000.
-export HBASE_HEAPSIZE={{hbase_heapsize}}m
+# The maximum amount of heap to use for hbase shell.
+export HBASE_SHELL_OPTS="-Xmx256m"
# Extra Java runtime options.
# Below are what we set by default. May only work with SUN JVM.
http://git-wip-us.apache.org/repos/asf/ambari/blob/edc8d14e/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
index d8e7267..7cd835e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
@@ -608,7 +608,7 @@ public class UpgradeCatalog213Test {
String expectedContent = "export HBASE_CLASSPATH=${HBASE_CLASSPATH}\n" +
"\n" +
"# The maximum amount of heap to use, in MB. Default is 1000.\n" +
- "export HBASE_HEAPSIZE={{hbase_heapsize}}m\n" +
+ "#export HBASE_HEAPSIZE={{hbase_heapsize}}m\n" +
"\n" +
"{% if java_version < 8 %}\n" +
"export HBASE_MASTER_OPTS=\" -XX:PermSize=64m -XX:MaxPermSize={{hbase_master_maxperm_size}}m -Xms{{hbase_heapsize}}m -Xmx{{hbase_heapsize}}m -Xmn{{hbase_master_xmn_size}}m -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly\"\n" +
@@ -616,7 +616,9 @@ public class UpgradeCatalog213Test {
"{% else %}\n" +
"export HBASE_MASTER_OPTS=\" -Xms{{hbase_heapsize}}m -Xmx{{hbase_heapsize}}m -Xmn{{hbase_master_xmn_size}}m -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly\"\n" +
"export HBASE_REGIONSERVER_OPTS=\" -Xmn{{regionserver_xmn_size}}m -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly -Xms{{regionserver_heapsize}}m -Xmx{{regionserver_heapsize}}m\"\n" +
- "{% endif %}\n";
+ "{% endif %}\n\n" +
+ "# The maximum amount of heap to use for hbase shell.\n" +
+ "export HBASE_SHELL_OPTS=\"-Xmx256m\"\n";
String result = (String) updateAmsHbaseEnvContent.invoke(upgradeCatalog213, oldContent);
Assert.assertEquals(expectedContent, result);
}