mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: discovery.nodes can sometimes be None when not master (#7747)

Browse Source 
* Fix: discovery.nodes can sometimes be None when not master

* Update discovery-wrapper.py

* Address short TTL as root cause.
This commit is contained in:
Paul Blasquez
2017-11-18 02:09:21 -08:00
committed by Neil Lathwood
parent 00a73a2432
commit 03cba5b24d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
discovery-wrapper.py
View File

@@ -156,8 +156,8 @@ if ('distributed_poller' in config and
if memc_alive(): if memc_alive():
if memc.get("discovery.master") is None: if memc.get("discovery.master") is None:
print "Registered as Master" print "Registered as Master"
memc.set("discovery.master", config['distributed_poller_name'], 10) memc.set("discovery.master", config['distributed_poller_name'], 30)
memc.set("discovery.nodes", 0, 300) memc.set("discovery.nodes", 0, 3600)
IsNode = False IsNode = False
else: else:
print "Registered as Node joining Master %s" % memc.get("discovery.master") print "Registered as Node joining Master %s" % memc.get("discovery.master")
@@ -246,7 +246,7 @@ def printworker():
global distdisco global distdisco
if distdisco: if distdisco:
if not IsNode: if not IsNode:
memc_touch('discovery.master', 10) memc_touch('discovery.master', 30)
nodes = memc.get('discovery.nodes') nodes = memc.get('discovery.nodes')
if nodes is None and not memc_alive(): if nodes is None and not memc_alive():
print "WARNING: Lost Memcached. Taking over all devices. Nodes will quit shortly." print "WARNING: Lost Memcached. Taking over all devices. Nodes will quit shortly."
@@ -256,7 +256,7 @@ def printworker():
print "INFO: %s Node(s) Total" % (nodes) print "INFO: %s Node(s) Total" % (nodes)
nodeso = nodes nodeso = nodes
else: else:
memc_touch('discovery.nodes', 10) memc_touch('discovery.nodes', 30)
try: try:
worker_id, device_id, elapsed_time = print_queue.get(False) worker_id, device_id, elapsed_time = print_queue.get(False)
except: except: