9:25 a.m.
From: Christos Sfakianakis <csfakian(a)redhat.com>
Hi,
this patch handles DeviceNotFound errors, noticed paritcularly with
VirtualBridgeVlanInHostRecipe, VirtualBridgeVlanInHostMirroredRecipe,
and VirtualBridgeVlansOverBondRecipe tests.
When attempting to (directly or indirectly) retrieve information for a
device which has been deleted, such errors are thrown.
Christos
Christos Sfakianakis (3):
lnst.Slave.InterfaceManager: add handler for DeviceDeleted and
RTM_NEWLINK
lnst.Devices.Device: add handlers in _get_if_data
lnst.Controller.Machine: add handler in device_created()
lnst/Controller/Machine.py | 10 +++++++++-
lnst/Devices/Device.py | 31 ++++++++++++++++++++-----------
lnst/Slave/InterfaceManager.py | 5 ++++-
3 files changed, 33 insertions(+), 13 deletions(-)
--
2.17.1
9:25 a.m.
New subject: [PATCH-next 1/3] lnst.Slave.InterfaceManager: add handler for DeviceDeleted and RTM_NEWLINK
From: Christos Sfakianakis <csfakian(a)redhat.com>
If a RTM_NEWLINK msg happens to concern a non-listed device which has
been marked for deletion, catch the DeviceDeleted exception and return.
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
lnst/Slave/InterfaceManager.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py
index b5d0091..245e8ab 100644
--- a/lnst/Slave/InterfaceManager.py
+++ b/lnst/Slave/InterfaceManager.py
@@ -172,7 +172,10 @@ class InterfaceManager(object):
"dev_data": dev._get_if_data()}
self._server_handler.send_data_to_ctl(update_msg)
- dev._disable()
+ try:
+ dev._disable()
+ except DeviceDeleted:
+ return
elif msg['header']['type'] == RTM_DELLINK:
if msg['index'] in self._devices:
dev = self._devices[msg['index']]
--
2.17.1
9:25 a.m.
New subject: [PATCH-next 2/3] lnst.Devices.Device: add handlers in _get_if_data
From: Christos Sfakianakis <csfakian(a)redhat.com>
The intented dictionary that shall contain interface data
depends on "this" instance's data exclusively, with the exception
of 'master', for which another device is possibly referenced. For
the latter case, avoid errors if the referenced device does not
exist any more. For all other keys, return an empty dictionary if
the device is already deleted, otherwise proceed as previously.
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
lnst/Devices/Device.py | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/lnst/Devices/Device.py b/lnst/Devices/Device.py
index 3037f45..bd47c11 100644
--- a/lnst/Devices/Device.py
+++ b/lnst/Devices/Device.py
@@ -21,7 +21,7 @@ from pyroute2.netlink.rtnl import ifinfmsg
from lnst.Common.Logs import log_exc_traceback
from lnst.Common.NetUtils import normalize_hwaddr
from lnst.Common.ExecCmd import exec_cmd
-from lnst.Common.DeviceError import DeviceError, DeviceDeleted, DeviceDisabled
+from lnst.Common.DeviceError import DeviceError, DeviceDeleted, DeviceDisabled,
DeviceNotFound
from lnst.Common.DeviceError import DeviceConfigError, DeviceConfigValueError
from lnst.Common.IpAddress import ipaddress
from lnst.Common.HWAddress import hwaddress
@@ -206,16 +206,25 @@ class Device(object):
self._ip_addrs.remove(addr)
def _get_if_data(self):
- if_data = {"ifindex": self.ifindex,
- "hwaddr": self.hwaddr,
- "name": self.name,
- "ip_addrs": self.ips,
- "link_header_type": self.link_header_type,
- "state": self.state,
- "master": self.master,
- "mtu": self.mtu,
- "driver": self.driver,
- "devlink": self._devlink}
+ try:
+ master = self.master
+ except DeviceNotFound:
+ master = None
+
+ try:
+ if_data = {"ifindex": self.ifindex,
+ "hwaddr": self.hwaddr,
+ "name": self.name,
+ "ip_addrs": self.ips,
+ "link_header_type": self.link_header_type,
+ "state": self.state,
+ "master": master,
+ "mtu": self.mtu,
+ "driver": self.driver,
+ "devlink": self._devlink}
+ except DeviceDeleted:
+ return {}
+
try:
ad_rx_coal, ad_tx_coal = self._read_adaptive_coalescing()
except DeviceError:
--
2.17.1
9:25 a.m.
New subject: [PATCH-next 3/3] lnst.Controller.Machine: add handler in device_created()
From: Christos Sfakianakis <csfakian(a)redhat.com>
Skip processing when the interface index cannot be found
in the device data. Log the action.
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
lnst/Controller/Machine.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py
index 6bc82b5..d23d57c 100644
--- a/lnst/Controller/Machine.py
+++ b/lnst/Controller/Machine.py
@@ -133,7 +133,15 @@ class Machine(object):
self.rpc_call("set_dev_netns", dev, dst.name, netns=src)
def device_created(self, dev_data):
- ifindex = dev_data["ifindex"]
+ try:
+ ifindex = dev_data["ifindex"]
+ except KeyError:
+ missing = 'data'
+ if dev_data:
+ missing = 'ifindex'
+ logging.debug("Skipping processing, device %s unavailable." %
missing)
+ return
+
if ifindex not in self._device_database:
new_dev = None
if len(self._tmp_device_database) > 0:
--
2.17.1
5:02 a.m.
On Wed, May 29, 2019 at 04:25:50PM +0200, csfakian(a)redhat.com wrote:
From: Christos Sfakianakis <csfakian(a)redhat.com>
Hi,
this patch handles DeviceNotFound errors, noticed paritcularly with
VirtualBridgeVlanInHostRecipe, VirtualBridgeVlanInHostMirroredRecipe,
and VirtualBridgeVlansOverBondRecipe tests.
When attempting to (directly or indirectly) retrieve information for a
device which has been deleted, such errors are thrown.
Christos
Christos Sfakianakis (3):
lnst.Slave.InterfaceManager: add handler for DeviceDeleted and
RTM_NEWLINK
lnst.Devices.Device: add handlers in _get_if_data
lnst.Controller.Machine: add handler in device_created()
lnst/Controller/Machine.py | 10 +++++++++-
lnst/Devices/Device.py | 31 ++++++++++++++++++++-----------
lnst/Slave/InterfaceManager.py | 5 ++++-
3 files changed, 33 insertions(+), 13 deletions(-)
--
2.17.1
_______________________________________________
LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedora...
Discussed this patchset offline. There seems to be a more serious
underlying issue here for which this would just be a workaround
solution.
We'll try to find a better solution for this.
-Ondrej
1787
days inactive
1788
days old
lnst-developers@lists.fedorahosted.org
4 comments
2 participants
participants (2)
-
csfakian＠redhat.com -
Ondrej Lichtner