Should allow AppManager.run_apps to terminate.
Signed-off-by: Jason Kölker <[email protected]>
---
ryu/services/protocols/ovsdb/client.py | 11 ++++++++---
ryu/services/protocols/ovsdb/manager.py | 18 ++++++++++++++----
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ryu/services/protocols/ovsdb/client.py
b/ryu/services/protocols/ovsdb/client.py
index 69d334f..387d91b 100644
--- a/ryu/services/protocols/ovsdb/client.py
+++ b/ryu/services/protocols/ovsdb/client.py
@@ -287,7 +287,7 @@ class RemoteOvsdb(app_manager.RyuApp):
except Exception:
self.logger.exception('Error running IDL for system_id %s' %
self.system_id)
- break
+ raise
hub.sleep(0)
@@ -295,7 +295,7 @@ class RemoteOvsdb(app_manager.RyuApp):
try:
func(*args, **kwargs)
- finally:
+ except:
self.stop()
def _transactions(self):
@@ -348,5 +348,10 @@ class RemoteOvsdb(app_manager.RyuApp):
self.threads.append(t)
def stop(self):
- super(RemoteOvsdb, self).stop()
+ # NOTE(jkoelker) Stop the idl and event_proxy threads first
+ # letting them finish their current loop.
+ self.is_active = False
+ hub.joinall(self.threads)
+
self._idl.close()
+ super(RemoteOvsdb, self).stop()
diff --git a/ryu/services/protocols/ovsdb/manager.py
b/ryu/services/protocols/ovsdb/manager.py
index 16ea08a..327f216 100644
--- a/ryu/services/protocols/ovsdb/manager.py
+++ b/ryu/services/protocols/ovsdb/manager.py
@@ -59,14 +59,15 @@ class OVSDB(app_manager.RyuApp):
def check(address):
return True
- while True:
+ while self.is_active:
try:
# TODO(jkoelker) SSL Certificate Fingerprint check
sock, client_address = server.accept()
except:
- self.logger.exception('Error accepting connection')
- continue
+ if self.is_active:
+ self.logger.exception('Error accepting connection')
+ continue
if not check(client_address[0]):
sock.shutdown(socket.SHUT_RDWR)
@@ -127,10 +128,19 @@ class OVSDB(app_manager.RyuApp):
return t
def stop(self):
- # TODO main_thread should be stopped first, not from super().stop
+ # NOTE(jkoelker) Attempt to gracefully stop the accept loop
+ self.is_active = False
+
+ # NOTE(jkoelker) Forceably kill the loop and clear the main_thread
+ if self.main_thread:
+ hub.kill(self.main_thread)
+ self.main_thread = None
+
+ # NOTE(jkoelker) Stop all the clients
for client in self._clients.values():
client.stop()
+ # NOTE(jkoelker) super will only take care of the event and joining now
super(OVSDB, self).stop()
@handler.set_ev_cls(event.EventModifyRequest)
--
2.5.0
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
