Browse Source

[abfs] Go through Raz when enabled

Romain Rigaux 4 years ago
parent
commit
2cd6183778

+ 7 - 2
desktop/core/src/desktop/lib/rest/http_client.py

@@ -58,8 +58,13 @@ def get_request_session(url, logger):
     with CACHE_SESSION_LOCK:
       CACHE_SESSION[url] = requests.Session()
       logger.debug("Setting request Session")
-      CACHE_SESSION[url].mount(url, requests.adapters.HTTPAdapter(pool_connections=conf.CHERRYPY_SERVER_THREADS.get(),
-                                                                  pool_maxsize=conf.CHERRYPY_SERVER_THREADS.get()))
+      CACHE_SESSION[url].mount(
+        url,
+        requests.adapters.HTTPAdapter(
+          pool_connections=conf.CHERRYPY_SERVER_THREADS.get(),
+          pool_maxsize=conf.CHERRYPY_SERVER_THREADS.get()
+        )
+      )
       logger.debug("Setting session adapter for %s" % url)
 
   return CACHE_SESSION

+ 0 - 5
desktop/core/src/desktop/lib/rest/raz_http_client.py

@@ -33,11 +33,6 @@ LOG = logging.getLogger(__name__)
 
 class RazHttpClient(HttpClient):
 
-  def __init__(self):
-    # Note: there is no concept of base_url and credentials anymore
-    # Maybe create here: http_client.HttpClient(url, exc_class=WebHdfsException, logger=LOG)
-    pass
-
   def execute(self, http_method, path, params=None, data=None, headers=None, allow_redirects=False, urlencode=True,
               files=None, stream=False, clear_cookies=False, timeout=conf.REST_CONN_TIMEOUT.get()):
 

+ 4 - 2
desktop/libs/azure/src/azure/abfs/abfs.py

@@ -124,9 +124,11 @@ class ABFS(object):
 
   def get_client(self, url):
     if RAZ.IS_ENABLED.get():
-      return resource.Resource(RazHttpClient())
+      client = RazHttpClient(url, exc_class=WebHdfsException, logger=LOG)
     else:
-      return resource.Resource(http_client.HttpClient(url, exc_class=WebHdfsException, logger=LOG))
+      client = http_client.HttpClient(url, exc_class=WebHdfsException, logger=LOG)
+
+    return resource.Resource(client)
 
   def _getheaders(self):
     headers = {