diff options
| author | YAMADA Hideki <yamada.hideki@po.ntts.co.jp> | 2013-02-24 12:56:22 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-02-24 12:56:22 +0900 |
| commit | b083da401f0cd2a2ef58acf9293e9daca867364c (patch) | |
| tree | 23c280f4181f8c6ea7c1347c782d146ba0eecf33 | |
| parent | 19a8d21636144911bd5906aa60a622197daee187 (diff) | |
controller: fix that sender thread is never terminated
Empty q.get() is blocking send thread.
Because of this issue, datapath state never transit to DEAD.
This fixes commit 83e3709a0d70f889e794d1c5f70c1c1eb73075f7.
- controller: fix send_q draining
https://github.com/osrg/ryu/commit/83e3709a0d70f889e794d1c5f70c1c1eb73075f7
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/controller/controller.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py index 9dc745ad..841b388c 100644 --- a/ryu/controller/controller.py +++ b/ryu/controller/controller.py @@ -196,10 +196,7 @@ class Datapath(object): buf = self.send_q.get() self.socket.sendall(buf) finally: - q = self.send_q self.send_q = None - while q.get(): - pass def send(self, buf): if self.send_q: |