openstack
/
neutron
Code Issues Proposed changes

Merge "Stop arping when interface gets deleted" into stable/newton

This commit is contained in:
Jenkins 2017-06-17 10:11:21 +00:00 committed by Gerrit Code Review
parent 9615febab1 7ff7ca21bb
commit 0363b21eff
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/agent/linux/ip_lib.py
View File

@ -1069,15 +1069,23 @@ def _arping(ns_name, iface_name, address, count, log_exception):
# platforms (>=Ubuntu 14.04), arping exit code can be 1.
ip_wrapper.netns.execute(arping_cmd, extra_ok_codes=[1])
except Exception as exc:
# Since this is spawned in a thread and executed 2 seconds
# apart, the interface may have been deleted while we were
# sleeping. Downgrade message to a warning and return early.
exists = device_exists(iface_name, namespace=ns_name)
msg = _("Failed sending gratuitous ARP to %(addr)s on "
"%(iface)s in namespace %(ns)s: %(err)s")
logger_method = LOG.exception
if not log_exception:
if not (log_exception or exists):
logger_method = LOG.warning
logger_method(msg, {'addr': address,
'iface': iface_name,
'ns': ns_name,
'err': exc})
if not exists:
LOG.warning(_LW("Interface %s might have been deleted "
"concurrently"), iface_name)
return
def send_ip_addr_adv_notif(

22
neutron/tests/unit/agent/linux/test_ip_lib.py
View File

@ -1416,6 +1416,28 @@ class TestArpPing(TestIPCmdBase):
ip_wrapper.netns.execute.assert_any_call(arping_cmd,
extra_ok_codes=[1])
@mock.patch.object(ip_lib, 'IPWrapper')
@mock.patch('eventlet.spawn_n')
def test_send_ipv4_addr_adv_notif_nodev(self, spawn_n, mIPWrapper):
spawn_n.side_effect = lambda f: f()
ip_wrapper = mIPWrapper(namespace=mock.sentinel.ns_name)
ip_wrapper.netns.execute.side_effect = RuntimeError
ARPING_COUNT = 3
address = '20.0.0.1'
config = mock.Mock()
config.send_arp_for_ha = ARPING_COUNT
with mock.patch.object(ip_lib, 'device_exists', return_value=False):
ip_lib.send_ip_addr_adv_notif(mock.sentinel.ns_name,
mock.sentinel.iface_name,
address,
config)
# should return early with a single call when ENODEV
mIPWrapper.assert_has_calls([
mock.call(namespace=mock.sentinel.ns_name),
mock.call().netns.execute(mock.ANY, extra_ok_codes=mock.ANY)
] * 1)
@mock.patch('eventlet.spawn_n')
def test_no_ipv6_addr_notif(self, spawn_n):
ipv6_addr = 'fd00::1'