Change in vdsm[master]: Make link state change monitoring use an async proc

Thursday, 17 October 2013

Antoni Segura Puimedon has uploaded a new change for review.

Change subject: Make link state change monitoring use an async proc
......................................................................

Make link state change monitoring use an async proc

Change-Id: Ief98bc08307652f541b7c9b87fca0499f9138b4f
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
---
M tests/functional/networkTests.py
1 file changed, 10 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/20259/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 7cb87ad..c95710f 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -17,9 +17,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 from contextlib import contextmanager
-from threading import Thread
 import os.path
-import time
 
 import neterrors
 
@@ -34,7 +32,8 @@
 from vdsm.ipwrapper import (ruleAdd, ruleDel, routeAdd, routeDel, routeExists,
                             ruleExists, Route, Rule, addrFlush)
 
-from vdsm.netinfo import operstate, prefix2netmask
+from vdsm.netinfo import prefix2netmask
+from vdsm.utils import execCmd
 
 
 NETWORK_NAME = 'test-network'
@@ -85,34 +84,17 @@
 
 @contextmanager
 def nonChangingOperstate(device):
-    """Raises an exception if it detects that the device operstate
changes."""
-    # The current implementation is raceful (but empirically tested to work)
-    # due to the fact that two changes could happen between iterations and no
-    # exception would be raised.
-    def changed(dev, changes):
-        status = operstate(dev)
-        while not done:
-            try:
-                newState = operstate(dev)
-                time.sleep(0.1)
-            except IOError as ioe:
-                _, message = ioe.args
-                changes.append(message)
-                break
-            if status != newState:
-                changes.append(newState)
-                status = newState
-
+    """Raises an exception if it detects that the device link state
changes."""
     try:
-        done = False
-        changes = []
-        monitoring_t = Thread(target=changed, name='operstate_mon',
-                              args=(device, changes))
-        monitoring_t.start()
+        monitoringProc = execCmd(['ip', 'monitor', 'link'],
sync=False) 
         yield
     finally:
-        time.sleep(3)  # So that the last action in yield gets to kernel
-        done = True
+        monitoringProc.kill()
+        out, _ = monitoringProc.communicate()
+        changes = []
+        for line in out.splitlines():
+            if ' %s:' % device in line:
+                changes.append(line.split()[-1])
         if changes:
             raise OperStateChangedError('%s operstate changed: %r' %
                                         (device, changes))


-- 
To view, visit http://gerrit.ovirt.org/20259
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief98bc08307652f541b7c9b87fca0499f9138b4f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011