Merge "There are instances where discovery to db takes more time and …

…discovery reports either the subscriber or publisher as down. but since all clients have other mechanism to detect server connection breaks and transition back up, it is safe to give more timeout [increased to 30] and change hc_max_miss accordingly" into R3.1

src/discovery/client.py

@@ -131,7 +131,7 @@ def _query(self):
             try:
                 self.stats['request'] += 1
                 r = requests.post(
-                    self.url, data=self.post_body, headers=self._headers, timeout=5)
+                    self.url, data=self.post_body, headers=self._headers, timeout=30)
                 if r.status_code == 200:
                     break
                 self.inc_stats('sc_%d' % r.status_code)
@@ -316,7 +316,7 @@ def _publish_int(self, service, data, oper_state = 'up', msg = ''):
         try:
             self.inc_pub_stats(service, 'request')
             r = requests.post(
-                self.puburl, data=json.dumps(payload), headers=self._headers, timeout=5)
+                self.puburl, data=json.dumps(payload), headers=self._headers, timeout=30)
             if r.status_code != 200:
                 self.inc_pub_stats(service, 'sc_%d' % r.status_code)
                 emsg = 'Status Code ' + str(r.status_code)

src/discovery/disc_consts.py

@@ -25,5 +25,5 @@
 HC_INTERVAL = 5
 
 # Expire published info after successive heartbeat miss
-HC_MAX_MISS = 5
+HC_MAX_MISS = 7