2
0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-12 08:40:24 +00:00

Back off https recheck

With various fixes, it does not make as much sense to be so aggressive
with rechecking https assuming we sense something prior to https
being up.
This commit is contained in:
Jarrod Johnson 2017-08-25 09:24:21 -04:00
parent 5c93976bdb
commit 0e708f4b26

View File

@ -447,12 +447,12 @@ def _recheck_single_unknown(configmanager, mac):
'https, will examine later'.format(
handler.devname, info['hwaddr'], handler.ipaddr
)})
if rechecker is not None and rechecktime > util.monotonic_time() + 60:
if rechecker is not None and rechecktime > util.monotonic_time() + 300:
rechecker.cancel()
# if cancel did not result in dead, then we are in progress
if rechecker is None or rechecker.dead:
rechecktime = util.monotonic_time() + 60
rechecker = eventlet.spawn_after(60, _periodic_recheck,
rechecktime = util.monotonic_time() + 300
rechecker = eventlet.spawn_after(300, _periodic_recheck,
configmanager)
return
nodename = get_nodename(configmanager, handler, info)
@ -556,11 +556,11 @@ def detected(info):
'https, will examine later'.format(
handler.devname, info['hwaddr'], handler.ipaddr
)})
if rechecker is not None and rechecktime > util.monotonic_time() + 60:
if rechecker is not None and rechecktime > util.monotonic_time() + 240:
rechecker.cancel()
if rechecker is None or rechecker.dead:
rechecktime = util.monotonic_time() + 60
rechecker = eventlet.spawn_after(60, _periodic_recheck, cfg)
rechecktime = util.monotonic_time() + 240
rechecker = eventlet.spawn_after(240, _periodic_recheck, cfg)
unknown_info[info['hwaddr']] = info
info['discostatus'] = 'unidentfied'
#TODO, eventlet spawn after to recheck sooner, or somehow else