Fix problems connecting to redis sentinel with SSL

Author: amanda11

fixed-requirements.txt

@@ -50,7 +50,7 @@ python-keyczar==0.716
 pytz==2021.1
 pywinrm==0.4.1
 pyyaml==5.4.1
-redis==3.5.3
+redis==4.1.4
 requests[security]==2.25.1
 retrying==1.3.3
 routes==2.4.1

requirements.txt

@@ -60,7 +60,7 @@ python-statsd==2.1.0
 pytz==2021.1
 pywinrm==0.4.1
 pyyaml==5.4.1
-redis==3.5.3
+redis==4.1.4
 rednose
 requests[security]==2.25.1
 retrying==1.3.3

st2common/requirements.txt

@@ -35,7 +35,7 @@ pymongo==3.11.3
 python-dateutil==2.8.1
 python-statsd==2.1.0
 pyyaml==5.4.1
-redis==3.5.3
+redis==4.1.4
 requests[security]==2.25.1
 retrying==1.3.3
 routes==2.4.1

st2common/st2common/util/monkey_patch.py

@@ -43,14 +43,21 @@ def monkey_patch(patch_thread=None):
                          patched unless debugger is used.
     :type patch_thread: ``bool``
     """
+    # Eventlet when patched doesn't throw the standard ssl error on timeout, which can break
+    # some third-party libraries including redis SSL.
+    # See: https://github.com/eventlet/eventlet/issues/692
+    # Therefore set the patched ssl module to use the standard socket.timeout exception
+    from eventlet.green import ssl
     import eventlet
+    from socket import timeout
 
     if patch_thread is None:
         patch_thread = not is_use_debugger_flag_provided()
 
     eventlet.monkey_patch(
         os=True, select=True, socket=True, thread=patch_thread, time=True
     )
+    ssl.timeout_exc = timeout
 
 
 def use_select_poll_workaround(nose_only=True):