ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-17799. AMS: Deleting ZK data in embedded mode results in external phoenix clients unable to connect on AMS restart. (swagle)
Date Tue, 19 Jul 2016 22:35:03 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 5db5de89a -> 19b02fa79


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


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

Branch: refs/heads/branch-2.4
Commit: 19b02fa79213b3f00c24df668f37e0027fc79a7b
Parents: 5db5de8
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Tue Jul 19 14:21:42 2016 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Tue Jul 19 15:34:57 2016 -0700

----------------------------------------------------------------------
 .../conf/unix/ambari-metrics-collector                          | 3 ++-
 .../AMBARI_METRICS/0.1.0/package/scripts/ams_service.py         | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/19b02fa7/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index f75a8e5..c106235 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/19b02fa7/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
index eb1b6d7..263ca0d 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
+++ b/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',


Mime
View raw message