fast exit dhcpbridge on 'old'
When dnsmasq sends a lease change event ('old'), we do nothing. However we wait quite a long time before we do nothing, and have built up rpc connections to conductor by then. We should exit early in these cases instead to cause less backup getting dnsmasq lease events processed. Related-Bug: #1532809 Change-Id: I1539fb9eb8570a9efbaa95a1272ac9ac571c365a
This commit is contained in:
parent
a37590c21b
commit
34e6c0fb15
@ -120,6 +120,14 @@ def main():
|
|||||||
logging.setup(CONF, "nova")
|
logging.setup(CONF, "nova")
|
||||||
global LOG
|
global LOG
|
||||||
LOG = logging.getLogger('nova.dhcpbridge')
|
LOG = logging.getLogger('nova.dhcpbridge')
|
||||||
|
|
||||||
|
if CONF.action.name == 'old':
|
||||||
|
# NOTE(sdague): old is the most frequent message sent, and
|
||||||
|
# it's a noop. We should just exit immediately otherwise we
|
||||||
|
# can stack up a bunch of requests in dnsmasq. A SIGHUP seems
|
||||||
|
# to dump this list, so actions queued up get lost.
|
||||||
|
return
|
||||||
|
|
||||||
objects.register_all()
|
objects.register_all()
|
||||||
|
|
||||||
if not CONF.conductor.use_local:
|
if not CONF.conductor.use_local:
|
||||||
@ -130,7 +138,7 @@ def main():
|
|||||||
LOG.warning(_LW('Conductor local mode is deprecated and will '
|
LOG.warning(_LW('Conductor local mode is deprecated and will '
|
||||||
'be removed in a subsequent release'))
|
'be removed in a subsequent release'))
|
||||||
|
|
||||||
if CONF.action.name in ['add', 'del', 'old']:
|
if CONF.action.name in ['add', 'del']:
|
||||||
LOG.debug("Called '%(action)s' for mac '%(mac)s' with IP '%(ip)s'",
|
LOG.debug("Called '%(action)s' for mac '%(mac)s' with IP '%(ip)s'",
|
||||||
{"action": CONF.action.name,
|
{"action": CONF.action.name,
|
||||||
"mac": CONF.action.mac,
|
"mac": CONF.action.mac,
|
||||||
|
Loading…
Reference in New Issue
Block a user