openstack/nova
Code Issues Proposed changes

Merge "fast exit dhcpbridge on 'old'"

Browse Source
This commit is contained in:
Jenkins 2016-01-30 17:49:51 +00:00 committed by Gerrit Code Review
commit 5a2d1543f0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/cmd/dhcpbridge.py
View File

@ -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,