Fix thread safety for gcp build

skypilot-org · Jun 8, 2024 · 8d13688 · 8d13688
1 parent c11094d
commit 8d13688
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/sky/adaptors/aws.py b/sky/adaptors/aws.py
@@ -28,7 +28,6 @@
 
 # pylint: disable=import-outside-toplevel
 
-import functools
 import logging
 import threading
 import time

diff --git a/sky/adaptors/gcp.py b/sky/adaptors/gcp.py
@@ -15,7 +15,7 @@
 
 # The google-api-python-client library is built on top of the httplib2 library,
 # which is not thread-safe.
-# Reference: https://googleapis.github.io/google-api-python-client/docs/thread_safety.html
+# Reference: https://googleapis.github.io/google-api-python-client/docs/thread_safety.html # pylint: disable=line-too-long
 # We use a thread-local LRU cache to ensure that each thread has its own
 # httplib2.Http object.
 @common.load_lazy_modules(_LAZY_MODULES)
@@ -28,29 +28,28 @@ def build(service_name: str, version: str, *args, **kwargs):
         version: Service version (e.g., 'v1').
     """
     import google_auth_httplib2
-    import googleapiclient
-    from googleapiclient import discovery
     import httplib2
 
     credentials = kwargs.pop('credentials', None)
     if credentials is None:
         credentials, _ = google.auth.default()
-    
+
     # Create a new Http() object for every request, to ensure that each thread
     # has its own httplib2.Http object for thread safety.
     def build_request(http, *args, **kwargs):
+        del http  # Unused.
         new_http = google_auth_httplib2.AuthorizedHttp(credentials,
                                                        http=httplib2.Http())
         return googleapiclient.http.HttpRequest(new_http, *args, **kwargs)
 
     authorized_http = google_auth_httplib2.AuthorizedHttp(credentials,
                                                           http=httplib2.Http())
-    return discovery.build(service_name,
-                           version,
-                           *args,
-                           requestBuilder=build_request,
-                           http=authorized_http,
-                           **kwargs)
+    return googleapiclient.discovery.build(service_name,
+                                           version,
+                                           *args,
+                                           requestBuilder=build_request,
+                                           http=authorized_http,
+                                           **kwargs)
 
 
 @common.load_lazy_modules(_LAZY_MODULES)