mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-01-21 00:21:24 +01:00
Code Issues Projects Releases Wiki Activity

app/ofctl: fix possible deadlock when the datapath disconnects

Browse Source 
Signed-off-by: Atzm Watanabe <atzm@iij.ad.jp>
Reviewed-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
This commit is contained in:
Atzm Watanabe 2018-09-13 12:24:28 +09:00 committed by FUJITA Tomonori
parent 0031cff9a3
commit e3aa55872b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ryu/app/ofctl/service.py
View File

@ -112,6 +112,7 @@ class OfctlService(app_manager.RyuApp):
msg = req.msg
datapath = msg.datapath
parser = datapath.ofproto_parser
is_barrier = isinstance(msg, parser.OFPBarrierRequest)
try:
si = self._switches[datapath.id]
@ -130,7 +131,16 @@ class OfctlService(app_manager.RyuApp):
si.xids[xid] = req
si.barriers[barrier_xid] = xid
if isinstance(req.msg, parser.OFPBarrierRequest):
def _cancel(barrier_xid, exc):
xid = si.barriers.pop(barrier_xid)
si.results.pop(xid)
si.xids.pop(xid)
if not is_barrier and req.reply_cls is not None:
self._unobserve_msg(req.reply_cls)
self.logger.error('failed to send message <%s>', msg)
self.reply_to_request(req, event.Reply(exception=exc))
if is_barrier:
barrier = msg
datapath.set_xid(barrier)
_store_xid(barrier.xid, barrier.xid)
@ -141,9 +151,13 @@ class OfctlService(app_manager.RyuApp):
barrier = datapath.ofproto_parser.OFPBarrierRequest(datapath)
datapath.set_xid(barrier)
_store_xid(msg.xid, barrier.xid)
datapath.send_msg(msg)
if not datapath.send_msg(msg):
return _cancel(barrier.xid,
exception.InvalidDatapath(result=datapath.id))
datapath.send_msg(barrier)
if not datapath.send_msg(barrier):
return _cancel(barrier.xid,
exception.InvalidDatapath(result=datapath.id))
@set_ev_cls(ofp_event.EventOFPBarrierReply, MAIN_DISPATCHER)
def _handle_barrier(self, ev):