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/08/17 14:58:58 UTC
ambari git commit: AMBARI-12784 RU: HS2 fails to start with invalid
maximum heap size (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 63134a7b6 -> baed7e987
AMBARI-12784 RU: HS2 fails to start with invalid maximum heap size (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/baed7e98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/baed7e98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/baed7e98
Branch: refs/heads/trunk
Commit: baed7e987ce5ad1628120655d6de33bf314bf08b
Parents: 63134a7
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Aug 17 15:58:40 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Aug 17 15:58:40 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/baed7e98/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index c4a08d9..f5a4d28 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -1566,10 +1566,10 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
}
//hive metastore and client_heapsize are added for HDP2, we should check if it exists and not add it for HDP1
if (!cluster.getDesiredConfigByType("hive-env").getProperties().containsKey("hive.client.heapsize")) {
- hiveEnvProps.put("hive.client.heapsize", "512m");
+ hiveEnvProps.put("hive.client.heapsize", "512");
}
if (!cluster.getDesiredConfigByType("hive-env").getProperties().containsKey("hive.metastore.heapsize")) {
- hiveEnvProps.put("hive.metastore.heapsize", "1024m");
+ hiveEnvProps.put("hive.metastore.heapsize", "1024");
}
if (cluster.getDesiredConfigByType("hive-env").getProperties().containsKey("hive_security_authorization") &&
"none".equalsIgnoreCase(cluster.getDesiredConfigByType("hive-env").getProperties().get("hive_security_authorization"))) {