nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-04 16:12:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bug on retrying failed devices

Browse Source
This commit is contained in:
Clint Armstrong
2015-08-25 11:35:15 -04:00
parent 1dcaa51011
commit 4736544e7e
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
poller-service.py
+14 -7
View File
@@ -219,6 +219,7 @@ while True:
cursor.execute(dev_query) cursor.execute(dev_query)
devices = cursor.fetchall() devices = cursor.fetchall()
retry_devs_found = {}
for device_id, next_poll in devices: for device_id, next_poll in devices:
# add queue lock, so we lock the next device against any other pollers # add queue lock, so we lock the next device against any other pollers
# if this fails, the device is locked by another poller already # if this fails, the device is locked by another poller already
@@ -228,21 +229,27 @@ while True:
releaseLock('queued.{}'.format(device_id)) releaseLock('queued.{}'.format(device_id))
continue continue
if device_id in dont_retry: if device_id in dont_retry:
retry_devs_found[device_id] = dont_retry[device_id]
releaseLock('queued.{}'.format(device_id)) releaseLock('queued.{}'.format(device_id))
continue continue
if next_poll > datetime.now(): if next_poll > datetime.now():
next_retry_device = min(dont_retry, key=dont_retry.get) poll_action = 'polling'
next_retry_time = dont_retry[next_retry_device] sleep_until_time = next_poll
try:
next_retry_device = min(retry_devs_found, key=retry_devs_found.get)
next_retry_time = retry_devs_found[next_retry_device]
if next_retry_time < next_poll: if next_retry_time < next_poll:
device_id = next_retry_device device_id = next_retry_device
if not getLock('queued.{}'.format(device_id)): if not getLock('queued.{}'.format(device_id)):
continue continue
print 'INFO: Sleeping until {} before retrying failed device {}'.format(next_retry_time, device_id) poll_action = 'retrying failed device'
sleep_until(next_retry_time) sleep_until_time = next_retry_time
else: except ValueError:
print 'INFO: Sleeping until {} before polling {}'.format(next_poll, device_id) pass
sleep_until(next_poll)
print 'INFO: Sleeping until {0} before {1} {2}'.format(next_poll, poll_action, device_id)
sleep_until(sleep_until_time)
print 'INFO: Starting poll of device {}'.format(device_id) print 'INFO: Starting poll of device {}'.format(device_id)
dont_retry[device_id] = datetime.now() + timedelta(seconds=down_retry) dont_retry[device_id] = datetime.now() + timedelta(seconds=down_retry)