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

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

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

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):

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']