The test cases added in this patch fails without the fix.
Suggested-by: Ben Pfaff <[email protected]>
Signed-off-by: Numan Siddique <[email protected]>
---
python/ovs/poller.py | 34 ++++++++++++++++++++++++++++++++--
python/ovs/socket_util.py | 5 +++--
python/ovs/stream.py | 11 +++++++++--
tests/automake.mk | 1 +
tests/ovsdb-idl.at | 16 ++++++++++++++++
tests/test-stream.py | 32 ++++++++++++++++++++++++++++++++
6 files changed, 93 insertions(+), 6 deletions(-)
create mode 100644 tests/test-stream.py
diff --git a/python/ovs/poller.py b/python/ovs/poller.py
index 2f3fcf9b6..ef67e6763 100644
--- a/python/ovs/poller.py
+++ b/python/ovs/poller.py
@@ -31,14 +31,21 @@ except ImportError:
SSL = None
try:
- import eventlet.patcher
+ from eventlet import patcher as eventlet_patcher
def _using_eventlet_green_select():
- return eventlet.patcher.is_monkey_patched(select)
+ return eventlet_patcher.is_monkey_patched(select)
except:
+ eventlet_patcher = None
def _using_eventlet_green_select():
return False
+try:
+ from gevent import monkey as gevent_monkey
+except:
+ gevent_monkey = None
+
+
vlog = ovs.vlog.Vlog("poller")
POLLIN = 0x001
@@ -257,3 +264,26 @@ class Poller(object):
def __reset(self):
self.poll = SelectPoll()
self.timeout = -1
+
+
+"""
+Returns the original select.poll() object. If select.poll is monkey patched
+by eventlet or gevent library, it gets the original select.poll and returns
+an object of it using the eventlet.patcher.original/gevent.monkey.get_original
+functions.
+
+As a last resort, if there is any exception it returns the SelectPoll() object.
+"""
+def get_system_poll():
+ try:
+ if _using_eventlet_green_select():
+ _system_poll = eventlet_patcher.original("select").poll
+ elif gevent_monkey and gevent_monkey.is_object_patched(
+ 'select', 'poll'):
+ _system_poll = gevent_monkey.get_original('select', 'poll')
+ else:
+ _system_poll = select.poll
+ except:
+ _system_poll = SelectPoll
+
+ return _system_poll()
diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index 403104936..8e582fe91 100644
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -162,8 +162,8 @@ def make_unix_socket(style, nonblock, bind_path,
connect_path, short=False):
def check_connection_completion(sock):
- p = ovs.poller.SelectPoll()
if sys.platform == "win32":
+ p = ovs.poller.SelectPoll()
event = winutils.get_new_event(None, False, True, None)
# Receive notification of readiness for writing, of completed
# connection or multipoint join operation, and of socket closure.
@@ -173,6 +173,7 @@ def check_connection_completion(sock):
win32file.FD_CLOSE)
p.register(event, ovs.poller.POLLOUT)
else:
+ p = ovs.poller.get_system_poll()
p.register(sock, ovs.poller.POLLOUT)
pfds = p.poll(0)
if len(pfds) == 1:
@@ -180,7 +181,7 @@ def check_connection_completion(sock):
if revents & ovs.poller.POLLERR:
try:
# The following should raise an exception.
- socket.send("\0", socket.MSG_DONTWAIT)
+ sock.send("\0".encode(), socket.MSG_DONTWAIT)
# (Here's where we end up if it didn't.)
# XXX rate-limit
diff --git a/python/ovs/stream.py b/python/ovs/stream.py
index 5996497a5..ca0d84425 100644
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -191,8 +191,15 @@ class Stream(object):
if error:
return error, None
else:
- status = ovs.socket_util.check_connection_completion(sock)
- return 0, cls(sock, name, status)
+ err = ovs.socket_util.check_connection_completion(sock)
+ if err == errno.EAGAIN or err == errno.EINPROGRESS:
+ status = errno.EAGAIN
+ err = 0
+ elif err == 0:
+ status = 0
+ else:
+ status = err
+ return err, cls(sock, name, status)
@staticmethod
def _open(suffix, dscp):
diff --git a/tests/automake.mk b/tests/automake.mk
index 8224e5a4a..0abf29d47 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -421,6 +421,7 @@ CHECK_PYFILES = \
tests/test-l7.py \
tests/test-ovsdb.py \
tests/test-reconnect.py \
+ tests/test-stream.py \
tests/MockXenAPI.py \
tests/test-unix-socket.py \
tests/test-unixctl.py \
diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at
index 014382850..e8a26e971 100644
--- a/tests/ovsdb-idl.at
+++ b/tests/ovsdb-idl.at
@@ -1720,3 +1720,19 @@ OVSDB_CHECK_IDL_COMPOUND_INDEX_WITH_REF([set, simple3
idl-compound-index-with-re
007: check simple4: empty
008: End test
]])
+
+m4_define([CHECK_STREAM_OPEN_BLOCK_PY],
+ [AT_SETUP([$1])
+ AT_SKIP_IF([test $2 = no])
+ AT_KEYWORDS([Check PY Stream open block - $3])
+ AT_CHECK([ovsdb_start_idltest "ptcp:0:127.0.0.1"])
+ PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT])
+ WRONG_PORT=$(($TCP_PORT+1))
+ AT_CHECK([$3 $srcdir/test-stream.py tcp:127.0.0.1:$TCP_PORT], [0], [ignore])
+ AT_CHECK([$3 $srcdir/test-stream.py tcp:127.0.0.1:$WRONG_PORT], [1],
[ignore])
+ OVSDB_SERVER_SHUTDOWN
+ AT_CHECK([$3 $srcdir/test-stream.py tcp:127.0.0.1:$TCP_PORT], [1], [ignore])
+ AT_CLEANUP])
+
+CHECK_STREAM_OPEN_BLOCK_PY([Check PY2 Stream open block], [$HAVE_PYTHON],
[$PYTHON])
+CHECK_STREAM_OPEN_BLOCK_PY([Check PY3 Stream open block], [$HAVE_PYTHON],
[$PYTHON3])
diff --git a/tests/test-stream.py b/tests/test-stream.py
new file mode 100644
index 000000000..4a5117501
--- /dev/null
+++ b/tests/test-stream.py
@@ -0,0 +1,32 @@
+# Copyright (c) 2018, Red Hat Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+
+import ovs.stream
+
+
+def main(argv):
+ remote = argv[1]
+ err, stream = ovs.stream.Stream.open_block(
+ ovs.stream.Stream.open(remote))
+
+ if err or stream is None:
+ sys.exit(1)
+
+ sys.exit(0)
+
+
+if __name__ == '__main__':
+ main(sys.argv)
