revert excess retries (#3)

Author: jdnurme

dataflux_core/download.py

@@ -1,5 +1,5 @@
 """
- Copyright 2023 Google LLC
+ Copyright 2024 Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -62,27 +62,16 @@ def compose(
 
     if storage_client is None:
         storage_client = storage.Client(project=project_name)
-    retries = 3
-    while True:
-        try:
-            bucket = storage_client.bucket(bucket_name)
-            destination = bucket.blob(destination_blob_name)
-
-            sources = list()
-            for each_object in objects:
-                blob_name = each_object[0]
-                sources.append(bucket.blob(blob_name))
-
-            destination.compose(sources, retry=MODIFIED_RETRY)
-            break
-        except Exception as e:
-            retries -= 1
-            logging.error(
-                f"compose encountered error ({retries} retries left): {str(e)}"
-            )
-            if retries <= 0:
-                raise RuntimeError(f"compose is out of retries; exiting: {e}")
-            continue
+
+    bucket = storage_client.bucket(bucket_name)
+    destination = bucket.blob(destination_blob_name)
+
+    sources = list()
+    for each_object in objects:
+        blob_name = each_object[0]
+        sources.append(bucket.blob(blob_name))
+
+    destination.compose(sources, retry=MODIFIED_RETRY)
 
     return destination
 
@@ -146,20 +135,9 @@ def download_single(
     Returns:
         the contents of the object in bytes.
     """
-    retries = 3
-    while True:
-        try:
-            bucket_handle = storage_client.bucket(bucket_name)
-            blob = bucket_handle.blob(object_name)
-            return blob.download_as_bytes(retry=MODIFIED_RETRY)
-        except Exception as e:
-            retries -= 1
-            logging.error(
-                f"download_single encountered error ({retries} retries left): {str(e)}"
-            )
-            if retries <= 0:
-                raise RuntimeError(f"download_single is out of retries; exiting: {e}")
-            continue
+    bucket_handle = storage_client.bucket(bucket_name)
+    blob = bucket_handle.blob(object_name)
+    return blob.download_as_bytes(retry=MODIFIED_RETRY)
 
 
 class DataFluxDownloadOptimizationParams:

dataflux_core/tests/fake_gcs.py

@@ -1,5 +1,5 @@
 """
-Copyright 2023 Google LLC
+Copyright 2024 Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -98,15 +98,10 @@ class Client(object):
     def __init__(self):
         self.buckets: dict[str, Bucket] = dict()
         self.content: dict[str, tuple[str, str]] = dict()
-        # This can be set to indicate how many sequential errors to trigger before passing.
-        self.error_count = 0
 
     def bucket(self, name: str) -> Bucket:
-        if self.error_count > 0:
-            self.error_count -= 1
-            raise Exception("Error")
         if name not in self.buckets:
             self.buckets[name] = Bucket(name)
             if name in self.content:
                 self.buckets[name].content = self.content[name]
-        return self.buckets[name]
+        return self.buckets[name]

dataflux_core/tests/test_download.py

@@ -1,5 +1,5 @@
 """
- Copyright 2023 Google LLC
+ Copyright 2024 Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -35,29 +35,6 @@ def test_compose(self):
         self.assertEqual(blob.name, destination_blob_name)
         self.assertEqual(blob.content, expected_result)
 
-    def test_compose_retries(self):
-        bucket_name = "test_bucket"
-        destination_blob_name = "dest_name"
-        objects = [("one", 3), ("two", 3), ("three", 5)]
-        client = fake_gcs.Client()
-        bucket = client.bucket(bucket_name)
-        bucket._add_file("one", bytes("one", "utf-8"))
-        bucket._add_file("two", bytes("two", "utf-8"))
-        bucket._add_file("three", bytes("three", "utf-8"))
-        client.error_count = 2
-        expected_result = b"onetwothree"
-        blob = download.compose("", bucket_name, destination_blob_name, objects, client)
-        self.assertEqual(blob.name, destination_blob_name)
-        self.assertEqual(blob.content, expected_result)
-        client.error_count = 3
-        try:
-            blob = download.compose(
-                "", bucket_name, destination_blob_name, objects, client
-            )
-            self.fail(f"expected RuntimeError but got {blob}")
-        except RuntimeError:
-            pass
-
     def test_decompose(self):
         bucket_name = "test_bucket"
         object_name = "test_obj"
@@ -78,23 +55,6 @@ def test_download_single(self):
         result = download.download_single(client, bucket_name, object_name)
         self.assertEqual(result, content)
 
-    def test_download_retry(self):
-        client = fake_gcs.Client()
-        bucket_name = "test_bucket"
-        object_name = "test_obj"
-        content = bytes("onetwothree", "utf-8")
-        bucket = client.bucket(bucket_name)
-        bucket._add_file(object_name, content)
-        client.error_count = 2
-        result = download.download_single(client, bucket_name, object_name)
-        self.assertEqual(result, content)
-        client.error_count = 3
-        try:
-            result = download.download_single(client, bucket_name, object_name)
-            self.fail(f"expected RuntimeError but got {result}")
-        except RuntimeError:
-            pass
-
     def test_dataflux_download(self):
         bucket_name = "test_bucket"
         objects = [("one", 3), ("two", 3), ("three", 5)]