You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/02/26 00:03:22 UTC
ambari git commit: AMBARI-15168: HBASE_OPTS resets during Ambari 2.2
upgrade (Ajit Kumar via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk c3b3bac94 -> 8fb17ab09
AMBARI-15168: HBASE_OPTS resets during Ambari 2.2 upgrade (Ajit Kumar via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8fb17ab0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8fb17ab0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8fb17ab0
Branch: refs/heads/trunk
Commit: 8fb17ab09e4b71817b5eea90097b2cb11979b5fb
Parents: c3b3bac
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Feb 25 15:03:18 2016 -0800
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu Feb 25 15:03:18 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog220.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8fb17ab0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog220.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog220.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog220.java
index a434429..2330a21 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog220.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog220.java
@@ -1017,7 +1017,7 @@ public class UpgradeCatalog220 extends AbstractUpgradeCatalog {
String content = hbaseEnvConfig.getProperties().get(CONTENT_PROPERTY);
if (content != null) {
if (!content.contains("-Djava.io.tmpdir")) {
- content += "\n\nexport HBASE_OPTS=\"-Djava.io.tmpdir={{java_io_tmpdir}}\"";
+ content += "\n\nexport HBASE_OPTS=\"${HBASE_OPTS} -Djava.io.tmpdir={{java_io_tmpdir}}\"";
updateConfig = true;
}
if (stackId != null && stackId.getStackName().equals("HDP") &&