AMBARI-14078 Metrics Collector startup is slow in Kerberized environment (dsen)

ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector

@@ -179,7 +179,7 @@ function start()
     rm -f "${PIDFILE}" >/dev/null 2>&1
   fi
 
-  nohup "${JAVA}" "-Xms$AMS_COLLECTOR_HEAPSIZE" "-Xmx$AMS_COLLECTOR_HEAPSIZE" "${AMS_COLLECTOR_OPTS}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
+  nohup "${JAVA}" "-Xms$AMS_COLLECTOR_HEAPSIZE" "-Xmx$AMS_COLLECTOR_HEAPSIZE" "${AMS_COLLECTOR_OPTS}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" >> $OUTFILE 2>&1 &
   PID=$!
   write_pidfile "${PIDFILE}"
   sleep 2
@@ -199,14 +199,21 @@ function start()
     exit -1
   fi
 
-  echo "Collector successfully started."
-  echo "Initializing Ambari Metrics data model"
-  # Wait until METRIC_RECORD table created
-  for retry in {1..10}
+  echo "$(date) Collector successfully started." | tee -a $OUTFILE
+  echo "$(date) Initializing Ambari Metrics data model" | tee -a $OUTFILE
+  start=$SECONDS
+  # Wait until METRIC_* tables created
+  for retry in {1..5}
   do
     echo 'list' | ${HBASE_CMD} --config ${HBASE_CONF_DIR} shell | grep ^${METRIC_TABLE_NAME} > /dev/null 2>&1
     if [ $? -eq 0 ]; then
-      echo "Ambari Metrics data model initialization completed."
+      echo "$(date) Ambari Metrics data model initialization completed." | tee -a $OUTFILE
+      break
+    fi
+    echo "$(date) Ambari Metrics data model initialization check $retry" | tee -a $OUTFILE
+    duration=$(( SECONDS - start ))
+    if [ $duration -gt 300 ]; then
+      echo "$(date) Ambari Metrics data model initialization timed out" | tee -a $OUTFILE
       break
     fi
     sleep 5
@@ -323,6 +330,3 @@ case "$1" in
 	;;
 
 esac
-
-
-

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py

@@ -59,7 +59,13 @@ def ams_service(name, action):
                   action='delete'
         )
 
-      daemon_cmd = format("{cmd} start")
+
+      if params.security_enabled:
+        kinit_cmd = format("{kinit_path_local} -kt {ams_collector_keytab_path} {ams_collector_jaas_princ};")
+        daemon_cmd = format("{kinit_cmd} {cmd} start")
+      else:
+        daemon_cmd = format("{cmd} start")
+
       Execute(daemon_cmd,
               user=params.ams_user
       )