mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-08 22:06:10 +02:00
Code Issues Projects Releases Wiki Activity

protocols/ovsdb: Forcably kill the main_thread

Browse Source 
Should allow AppManager.run_apps to terminate.

Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Jason Kölker 2016-01-27 04:20:56 +00:00 committed by FUJITA Tomonori
parent 636de20197
commit a71c2a9e1b
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ryu/services/protocols/ovsdb/client.py
View File

@ -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()

18
ryu/services/protocols/ovsdb/manager.py
View File

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