ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [3/7] git commit: AMBARI-7646 Zookeeper server stops after starting on HDP 2.2 (dsen)
Date Mon, 06 Oct 2014 15:12:51 GMT
AMBARI-7646 Zookeeper server stops after starting on HDP 2.2 (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7f0ea265
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7f0ea265
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7f0ea265

Branch: refs/heads/branch-alerts-dev
Commit: 7f0ea265c877b665e4744272fc4bd2c72e698bcb
Parents: 26c4cc8
Author: Dmytro Sen <dsen@hortonworks.com>
Authored: Mon Oct 6 14:52:19 2014 +0300
Committer: Dmytro Sen <dsen@hortonworks.com>
Committed: Mon Oct 6 14:52:30 2014 +0300

----------------------------------------------------------------------
 .../HDP/2.0.6/services/ZOOKEEPER/configuration/zookeeper-env.xml   | 1 +
 .../stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py  | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f0ea265/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/zookeeper-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/zookeeper-env.xml
index b0d55e6..4c305b0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/zookeeper-env.xml
@@ -69,6 +69,7 @@
     <description>This is the jinja template for zookeeper-env.sh file</description>
     <value>
 export JAVA_HOME={{java64_home}}
+export ZOOKEEPER_HOME={{zk_home}}
 export ZOO_LOG_DIR={{zk_log_dir}}
 export ZOOPIDFILE={{zk_pid_file}}
 export SERVER_JVMFLAGS={{zk_server_heapsize}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/7f0ea265/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
index 89d1089..9e09d5f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
@@ -31,9 +31,11 @@ rpm_version = default("/configurations/cluster-env/rpm_version", None)
 
 #hadoop params
 if rpm_version:
+  zk_home = '/usr/hdp/current/zookeeper'
   zk_bin = '/usr/hdp/current/zookeeper/bin'
   smoke_script = '/usr/hdp/current/zookeeper/bin/zkCli.sh'
 else:
+  zk_home = '/usr'
   zk_bin = '/usr/lib/zookeeper/bin'
   smoke_script = "/usr/lib/zookeeper/bin/zkCli.sh"
 


Mime
View raw message