AMBARI-17799. AMS: Deleting ZK data in embedded mode results in external phoenix clients unable to connect on AMS restart. (swagle)

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

@@ -283,7 +283,8 @@ function start()
     echo "$(date) Initializing Ambari Metrics data model" | tee -a $STARTUPFILE
     start=$SECONDS
     # Wait until METRIC_* tables created
-    for retry in {1..5}
+    # Wait for 10 tries or 5 minutes whichever comes first
+    for retry in {1..10}
     do
       echo 'list' | ${HBASE_CMD} --config ${HBASE_CONF_DIR} shell 2> /dev/null | grep ^${METRIC_TABLES[0]} > /dev/null 2>&1
       if [ $? -eq 0 ]; then

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

@@ -58,11 +58,6 @@ def ams_service(name, action):
       Execute(format("{sudo} rm -rf {hbase_tmp_dir}/*.tmp")
       )
 
-      if not params.is_hbase_distributed and os.path.exists(format("{zookeeper_data_dir}")):
-        Directory(params.zookeeper_data_dir,
-                  action='delete'
-        )
-
       if not params.is_hbase_distributed:
         File(format("{ams_collector_conf_dir}/core-site.xml"),
              action='delete',