Merge branch 'master' into enable-oidc

Author: mbohlool

configuration.py

@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 
+import multiprocessing
 import logging
 import sys
 
@@ -83,11 +84,12 @@ def __init__(self):
         # Set this to True/False to enable/disable SSL hostname verification.
         self.assert_hostname = None
         # urllib3 connection pool's maximum number of connections saved
-        # per pool. Increasing this is useful for cases when you are
-        # making a lot of possibly parallel requests to the same host,
-        # which is often the case here.
-        # When set to `None`, will default to whatever urllib3 uses
-        self.connection_pool_maxsize = None
+        # per pool. urllib3 uses 1 connection as default value, but this is
+        # not the best value when you are making a lot of possibly parallel
+        # requests to the same host, which is often the case here.
+        # cpu_count * 5 is used as default value to increase performance
+        # This is used because it's the default value for ThreadPoolExecutor
+        self.connection_pool_maxsize = multiprocessing.cpu_count() * 5
         # http proxy setting
         self.http_proxy_url = None
 

watch/watch.py

@@ -109,6 +109,7 @@ def stream(self, func, *args, **kwargs):
                     watch.stop()
         """
 
+        self._stop = False
         return_type = self.get_return_type(func)
         kwargs['watch'] = True
         kwargs['_preload_content'] = False

watch/watch_test.py

@@ -58,6 +58,33 @@ def test_watch_with_decode(self):
         fake_resp.close.assert_called_once()
         fake_resp.release_conn.assert_called_once()
 
+    def test_watch_stream_twice(self):
+        w = Watch(float)
+        for step in ['first', 'second']:
+            fake_resp = Mock()
+            fake_resp.close = Mock()
+            fake_resp.release_conn = Mock()
+            fake_resp.read_chunked = Mock(
+                return_value=['{"type": "ADDED", "object": 1}\n'] * 4)
+
+            fake_api = Mock()
+            fake_api.get_namespaces = Mock(return_value=fake_resp)
+            fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList'
+
+            count = 1
+            for e in w.stream(fake_api.get_namespaces):
+                count += 1
+                if count == 3:
+                    w.stop()
+
+            self.assertEqual(count, 3)
+            fake_api.get_namespaces.assert_called_once_with(
+                _preload_content=False, watch=True)
+            fake_resp.read_chunked.assert_called_once_with(
+                decode_content=False)
+            fake_resp.close.assert_called_once()
+            fake_resp.release_conn.assert_called_once()
+
     def test_unmarshal_with_float_object(self):
         w = Watch()
         event = w.unmarshal_event('{"type": "ADDED", "object": 1}', 'float')