You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/02/24 13:44:22 UTC

[3/3] ambari git commit: AMBARI-9758 - AMS: when Add Service for AMS, the first service check fails

AMBARI-9758 - AMS: when Add Service for AMS, the first service check fails


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

Branch: refs/heads/branch-2.0.0
Commit: 0f433484aac8a47ba923cf6f51d596bb4ac949f6
Parents: 31335a8
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Tue Feb 24 14:43:49 2015 +0200
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Tue Feb 24 14:43:49 2015 +0200

----------------------------------------------------------------------
 .../0.1.0/package/scripts/service_check.py      | 32 ++++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f433484/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py
index 7954f8c..e5ee7f9 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py
@@ -38,7 +38,7 @@ import socket
 class AMSServiceCheck(Script):
   AMS_METRICS_POST_URL = "/ws/v1/timeline/metrics/"
   AMS_METRICS_GET_URL = "/ws/v1/timeline/metrics?%s"
-  AMS_CONNECT_TRIES = 3
+  AMS_CONNECT_TRIES = 5
   AMS_CONNECT_TIMEOUT = 10
 
   @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
@@ -83,29 +83,35 @@ class AMSServiceCheck(Script):
         conn = httplib.HTTPConnection(params.ams_collector_host_single,
                                         int(params.metric_collector_port))
         conn.request("POST", self.AMS_METRICS_POST_URL, metric_json, headers)
-        break
       except (httplib.HTTPException, socket.error) as ex:
         if i < self.AMS_CONNECT_TRIES - 1:  #range/xrange returns items from start to end-1
           time.sleep(self.AMS_CONNECT_TIMEOUT)
           Logger.info("Connection failed. Next retry in %s seconds."
                       % (self.AMS_CONNECT_TIMEOUT))
+          continue
         else:
           raise Fail("Metrics were not saved. Service check has failed. "
                "\nConnection failed.")
 
-    response = conn.getresponse()
-    Logger.info("Http response: %s %s" % (response.status, response.reason))
+      response = conn.getresponse()
+      Logger.info("Http response: %s %s" % (response.status, response.reason))
 
-    data = response.read()
-    Logger.info("Http data: %s" % data)
-    conn.close()
+      data = response.read()
+      Logger.info("Http data: %s" % data)
+      conn.close()
 
-    if response.status == 200:
-      Logger.info("Metrics were saved.")
-    else:
-      Logger.info("Metrics were not saved. Service check has failed.")
-      raise Fail("Metrics were not saved. Service check has failed. POST request status: %s %s \n%s" %
-                 (response.status, response.reason, data))
+      if response.status == 200:
+        Logger.info("Metrics were saved.")
+        break
+      else:
+        Logger.info("Metrics were not saved. Service check has failed.")
+        if i < self.AMS_CONNECT_TRIES - 1:  #range/xrange returns items from start to end-1
+          time.sleep(self.AMS_CONNECT_TIMEOUT)
+          Logger.info("Next retry in %s seconds."
+                      % (self.AMS_CONNECT_TIMEOUT))
+        else:
+          raise Fail("Metrics were not saved. Service check has failed. POST request status: %s %s \n%s" %
+                     (response.status, response.reason, data))
 
     get_metrics_parameters = {
       "metricNames": "AMBARI_METRICS.SmokeTest.FakeMetric",