Merge pull request #861 from mboersma/session-optimization

ref(*): use requests.Session as a singleton

Author: mboersma

rootfs/api/models/app.py

@@ -27,6 +27,23 @@
 
 logger = logging.getLogger(__name__)
 
+session = None
+
+
+def get_session():
+    global session
+    if session is None:
+        session = requests.Session()
+        session.headers = {
+            # https://toolbelt.readthedocs.org/en/latest/user-agent.html#user-agent-constructor
+            'User-Agent': user_agent('Deis Controller', deis_version),
+        }
+        # `mount` a custom adapter that retries failed connections for HTTP and HTTPS requests.
+        # http://docs.python-requests.org/en/latest/api/#requests.adapters.HTTPAdapter
+        session.mount('http://', requests.adapters.HTTPAdapter(max_retries=10))
+        session.mount('https://', requests.adapters.HTTPAdapter(max_retries=10))
+    return session
+
 
 # http://kubernetes.io/v1.1/docs/design/identifiers.html
 def validate_id_is_docker_compatible(value):
@@ -525,27 +542,18 @@ def verify_application_health(self, **kwargs):
             allowed.remove(404)
             req_timeout = 3
 
-        session = requests.Session()
-        session.headers = {
-            # https://toolbelt.readthedocs.org/en/latest/user-agent.html#user-agent-constructor
-            'User-Agent': user_agent('Deis Controller', deis_version),
-            # set the Host header for the application being checked - not used for actual routing
-            'Host': '{}.{}.nip.io'.format(self.id, settings.ROUTER_HOST)
-        }
-
-        # `mount` a custom adapter that retries failed connections for HTTP and HTTPS requests.
-        # http://docs.python-requests.org/en/latest/api/#requests.adapters.HTTPAdapter
-        session.mount('http://', requests.adapters.HTTPAdapter(max_retries=10))
-        session.mount('https://', requests.adapters.HTTPAdapter(max_retries=10))
-
         # Give the router max of 10 tries or max 30 seconds to become healthy
         # Uses time module to account for the timout value of 3 seconds
         start = time.time()
         failed = False
+        headers = {
+            # set the Host header for the application being checked - not used for actual routing
+            'Host': '{}.{}.nip.io'.format(self.id, settings.ROUTER_HOST),
+        }
         for _ in range(10):
             try:
                 # http://docs.python-requests.org/en/master/user/advanced/#timeouts
-                response = session.get(url, timeout=req_timeout)
+                response = get_session().get(url, timeout=req_timeout, headers=headers)
                 failed = False
             except requests.exceptions.RequestException:
                 # In case of a failure where response object is not available

rootfs/scheduler/__init__.py

@@ -81,23 +81,30 @@ def unhealthy(status_code):
     return False
 
 
-class KubeHTTPClient(object):
-    apiversion = "v1"
+session = None
 
-    def __init__(self):
-        self.url = settings.SCHEDULER_URL
 
+def get_session():
+    global session
+    if session is None:
         with open('/var/run/secrets/kubernetes.io/serviceaccount/token') as token_file:
             token = token_file.read()
-
         session = requests.Session()
         session.headers = {
             'Authorization': 'Bearer ' + token,
             'Content-Type': 'application/json',
             'User-Agent': user_agent('Deis Controller', deis_version)
         }
         session.verify = '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt'
-        self.session = session
+    return session
+
+
+class KubeHTTPClient(object):
+    apiversion = "v1"
+
+    def __init__(self):
+        self.url = settings.SCHEDULER_URL
+        self.session = get_session()
 
     def deploy(self, namespace, name, image, command, **kwargs):  # noqa
         logger.info('deploy {}, img {}, cmd "{}"'.format(name, image, command))