Resolve merge conflict when cherry picking apache#8925

aaltay · Jun 21, 2019 · 43dd34e · 43dd34e
1 parent 298e54b
commit 43dd34e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sdks/python/apache_beam/internal/gcp/auth.py b/sdks/python/apache_beam/internal/gcp/auth.py
@@ -93,7 +93,7 @@ def _refresh(self, http_request):
     token_url = ('http://{}/computeMetadata/v1/instance/service-accounts/'
                  'default/token').format(metadata_root)
     req = Request(token_url, headers={'Metadata-Flavor': 'Google'})
-    token_data = json.loads(urlopen(req).read())
+    token_data = json.loads(urlopen(req, timeout=60).read())
     self.access_token = token_data['access_token']
     self.token_expiry = (refresh_time +
                          datetime.timedelta(seconds=token_data['expires_in']))