You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2015/02/03 03:53:21 UTC

ambari git commit: AMBARI-8901. Kafka PID file and log dir settings are ignored by Ambari. (Sriharsha Chintalapani via yusaku)

Repository: ambari
Updated Branches:
  refs/heads/trunk 314ae0b10 -> b178920dd


AMBARI-8901. Kafka PID file and log dir settings are ignored by Ambari. (Sriharsha Chintalapani via yusaku)


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

Branch: refs/heads/trunk
Commit: b178920dda64edc3b9298e6d117fcc4047283230
Parents: 314ae0b
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Feb 2 15:00:53 2015 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Feb 2 18:52:59 2015 -0800

----------------------------------------------------------------------
 .../KAFKA/0.8.1.2.2/configuration/kafka-env.xml                | 2 ++
 .../common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py   | 2 +-
 .../KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py            | 4 ++--
 .../common-services/KAFKA/0.8.1.2.2/package/scripts/params.py  | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b178920d/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
index f322406..98814aa 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
@@ -50,6 +50,8 @@
 # The java implementation to use.
 export JAVA_HOME={{java64_home}}
 export PATH=$PATH:$JAVA_HOME/bin
+export PID_DIR={{kafka_pid_dir}}
+export LOG_DIR={{kafka_log_dir}}
 
 # Add kafka sink to classpath and related depenencies
 if [ -e "/usr/lib/ambari-metrics-kafka-sink/ambari-metrics-kafka-sink.jar" ]; then

http://git-wip-us.apache.org/repos/asf/ambari/blob/b178920d/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
index f00575e..c75222b 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
@@ -26,7 +26,7 @@ from copy import deepcopy
 def kafka():
     import params
 
-    Directory([params.log_dir, params.pid_dir, params.conf_dir],
+    Directory([params.kafka_log_dir, params.kafka_pid_dir, params.conf_dir],
               owner=params.kafka_user,
               group=params.user_group,
               recursive=True

http://git-wip-us.apache.org/repos/asf/ambari/blob/b178920d/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
index ce72353..31d949a 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
@@ -47,7 +47,7 @@ class KafkaBroker(Script):
     env.set_params(params)
     self.configure(env)
     daemon_cmd = format('source {params.conf_dir}/kafka-env.sh ; {params.kafka_bin} start')
-    no_op_test = format('ls {params.pid_file} >/dev/null 2>&1 && ps -p `cat {params.pid_file}` >/dev/null 2>&1')
+    no_op_test = format('ls {params.kafka_pid_file} >/dev/null 2>&1 && ps -p `cat {params.kafka_pid_file}` >/dev/null 2>&1')
     Execute(daemon_cmd,
             user=params.kafka_user,
             not_if=no_op_test
@@ -61,7 +61,7 @@ class KafkaBroker(Script):
     Execute(daemon_cmd,
             user=params.kafka_user,
     )
-    Execute (format("rm -f {params.pid_file}"))
+    Execute (format("rm -f {params.kafka_pid_file}"))
 
 
   def status(self, env):

http://git-wip-us.apache.org/repos/asf/ambari/blob/b178920d/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
index 39bec56..99d11d2 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
@@ -43,9 +43,9 @@ else:
 
 conf_dir = "/etc/kafka/conf"
 kafka_user = config['configurations']['kafka-env']['kafka_user']
-log_dir = config['configurations']['kafka-env']['kafka_log_dir']
-pid_dir = status_params.kafka_pid_dir
-pid_file = pid_dir+"/kafka.pid"
+kafka_log_dir = config['configurations']['kafka-env']['kafka_log_dir']
+kafka_pid_dir = status_params.kafka_pid_dir
+kafka_pid_file = kafka_pid_dir+"/kafka.pid"
 hostname = config['hostname']
 user_group = config['configurations']['cluster-env']['user_group']
 java64_home = config['hostLevelParams']['java_home']