kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-29 04:05:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

update zonefile inventory refresh time even if we failed to get a

Browse Source 
zonefile inventory (stops us from hammering the same dead peer over and
over)
This commit is contained in:
Jude Nelson
2016-09-15 11:42:20 -04:00
parent e9af1f6406
commit 5a096ae317
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
blockstack/atlas.py
View File

@@ -2057,24 +2057,24 @@ def atlas_peer_refresh_zonefile_inventory( my_hostport, peer_hostport, byte_offs
inv = atlas_peer_sync_zonefile_inventory( my_hostport, peer_hostport, maxlen, timeout=timeout, peer_table=peer_table ) inv = atlas_peer_sync_zonefile_inventory( my_hostport, peer_hostport, maxlen, timeout=timeout, peer_table=peer_table )
if inv is not None: if locked:
# success! Update refresh time peer_table = atlas_peer_table_lock()
if locked:
peer_table = atlas_peer_table_lock()
if peer_hostport not in peer_table.keys():
if locked:
atlas_peer_table_unlock()
peer_table = None
return False
peer_table[peer_hostport]['zonefile_inventory_last_refresh'] = time_now()
if peer_hostport not in peer_table.keys():
if locked: if locked:
atlas_peer_table_unlock() atlas_peer_table_unlock()
peer_table = None peer_table = None
return False
# Update refresh time (even if we fail)
peer_table[peer_hostport]['zonefile_inventory_last_refresh'] = time_now()
if locked:
atlas_peer_table_unlock()
peer_table = None
if inv is not None:
log.debug("%s: inventory of %s is now '%s'" % (my_hostport, peer_hostport, atlas_inventory_to_string(inv))) log.debug("%s: inventory of %s is now '%s'" % (my_hostport, peer_hostport, atlas_inventory_to_string(inv)))
if inv is None: if inv is None:
@@ -3229,7 +3229,6 @@ class AtlasHealthChecker( threading.Thread ):
# who are we going to ping? # who are we going to ping?
# someone we haven't pinged in a while, chosen at random # someone we haven't pinged in a while, chosen at random
log.debug("Refresh zonefile inventories for at most %s peers" % num_peers)
for peer in peer_hostports: for peer in peer_hostports:
if not atlas_peer_has_fresh_zonefile_inventory( peer, local_inv=local_inv, peer_table=peer_table, con=con, path=path ): if not atlas_peer_has_fresh_zonefile_inventory( peer, local_inv=local_inv, peer_table=peer_table, con=con, path=path ):
# haven't talked to this peer in a while # haven't talked to this peer in a while
@@ -3240,6 +3239,9 @@ class AtlasHealthChecker( threading.Thread ):
atlas_peer_table_unlock() atlas_peer_table_unlock()
peer_table = None peer_table = None
if len(stale_peers) > 0:
log.debug("Refresh zonefile inventories for %s peers" % len(stale_peers))
for peer_hostport in stale_peers: for peer_hostport in stale_peers:
# refresh everyone # refresh everyone
log.debug("%s: Refresh zonefile inventory for %s" % (self.hostport, peer_hostport)) log.debug("%s: Refresh zonefile inventory for %s" % (self.hostport, peer_hostport))