You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/11/19 17:37:07 UTC
ambari git commit: AMBARI-13969 Validate that hive-env.sh content is
valid when Ambari is upgraded from 2.1.0 -> 2.1.2 -> 2.1.3 (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 23919c184 -> 7603d3ff5
AMBARI-13969 Validate that hive-env.sh content is valid when Ambari is upgraded from 2.1.0 -> 2.1.2 -> 2.1.3 (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7603d3ff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7603d3ff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7603d3ff
Branch: refs/heads/trunk
Commit: 7603d3ff5b4df29b81d5e320ffe6f5424cbd0c57
Parents: 23919c1
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Nov 19 18:36:57 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Nov 19 18:36:57 2015 +0200
----------------------------------------------------------------------
.../org/apache/ambari/server/upgrade/UpgradeCatalog213.java | 2 +-
.../apache/ambari/server/upgrade/UpgradeCatalog213Test.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7603d3ff/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 1278e31..4a193bc 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
@@ -1078,7 +1078,7 @@ public class UpgradeCatalog213 extends AbstractUpgradeCatalog {
String newHeapSizeRegex = "export HADOOP_HEAPSIZE={{hive_heapsize}} # Setting for HiveServer2 and Client\n" +
"fi\n" +
"\n" +
- "export HADOOP_CLIENT_OPTS=\"$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m\"";
+ "export HADOOP_CLIENT_OPTS=\"$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m\"\n";
return hiveEnvContent.replaceAll(oldHeapSizeRegex, Matcher.quoteReplacement(newHeapSizeRegex));
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7603d3ff/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 421246c..0cde661 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
@@ -1248,7 +1248,8 @@ public class UpgradeCatalog213Test {
"else\n" +
" export HADOOP_HEAPSIZE=\"{{hive_heapsize}}\"\n" +
"fi\n" +
- "\n";
+ "\n" +
+ "# Larger heap size may be required when running queries over large number of files or partitions.\n";
expectedResult = "# The heap size of the jvm stared by hive shell script can be controlled via:\n" +
"export SERVICE=$SERVICE\n" +
"if [ \"$SERVICE\" = \"metastore\" ]; then\n" +
@@ -1257,7 +1258,8 @@ public class UpgradeCatalog213Test {
" export HADOOP_HEAPSIZE={{hive_heapsize}} # Setting for HiveServer2 and Client\n" +
"fi\n" +
"\n" +
- "export HADOOP_CLIENT_OPTS=\"$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m\"";
+ "export HADOOP_CLIENT_OPTS=\"$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m\"\n" +
+ "# Larger heap size may be required when running queries over large number of files or partitions.\n";
Assert.assertEquals(expectedResult, upgradeCatalog213.updateHiveEnvContent(testContent));
}