Add timeout for s3 download (#27386)

* Add timeout for s3 download * Add the comments about lifetime
brave · Jan 31, 2025 · d8d340c · d8d340c
1 parent 3a145ae
commit d8d340c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tools/perf/components/cloud_storage.py b/tools/perf/components/cloud_storage.py
@@ -17,8 +17,8 @@
 
 
 class CloudFolder(str, Enum):
-  TEST_PROFILES = 'perf-profiles'
-  CATAPULT_PERF_DATA = 'telemetry-perf-data'
+  TEST_PROFILES = 'perf-profiles'  # 6 months lifetime
+  CATAPULT_PERF_DATA = 'telemetry-perf-data'  # infinite lifetime
 
 
 def UpdateSha1(path: str):
@@ -40,7 +40,7 @@ def UploadFileToCloudStorage(folder: CloudFolder, path: str):
 
   s3_url = f's3://{_CLOUD_BUCKET}/{folder}/{sha1}'
   success, _ = perf_test_utils.GetProcessOutput(
-      ['aws', 's3', 'cp', path, s3_url, '--sse', 'AES256'])
+      ['aws', 's3', 'cp', path, s3_url, '--sse', 'AES256'], timeout=10 * 60)
   if not success:
     raise RuntimeError(f'Can\'t upload to {s3_url}')
   return path + '.sha1'
diff --git a/tools/perf/components/perf_test_utils.py b/tools/perf/components/perf_test_utils.py
@@ -107,13 +107,13 @@ def GetProcessOutput(args: List[str],
     return False, e.output
 
 
-def DownloadFile(url: str, output: str):
+def DownloadFile(url: str, output: str, timeout_sec=3 * 60):
 
   def load_data():
     for _ in range(3):
       try:
         logging.info('Downloading %s to %s', url, output)
-        f = urlopen(url)
+        f = urlopen(url, timeout=timeout_sec)
         return f.read()
       except Exception:
         logging.error('Download attempt failed')