Reraise original error instead of RetryError

retry error is not helpful for enduser.

Author: FlorentinD

graphdatascience/query_runner/gds_arrow_client.py

@@ -32,7 +32,6 @@
     stop_after_attempt,
     stop_after_delay,
     wait_exponential,
-    wait_fixed,
 )
 
 from graphdatascience.retry_utils.retry_utils import before_log
@@ -153,10 +152,11 @@ def connection_info(self) -> tuple[str, int]:
         return self._host, self._port
 
     @retry(
+        reraise=True,
         before=before_log("Request token", _arrow_client_logger, logging.DEBUG),
         retry=retry_any(retry_if_exception_type(FlightTimedOutError), retry_if_exception_type(FlightUnavailableError)),
-        stop=stop_after_attempt(3),
-        wait=wait_fixed(1),
+        stop=(stop_after_delay(10) | stop_after_attempt(5)),
+        wait=wait_exponential(multiplier=1, min=1, max=10),
     )
     def request_token(self) -> Optional[str]:
         """
@@ -599,6 +599,7 @@ def _client(self) -> flight.FlightClient:
         return self._flight_client
 
     @retry(
+        reraise=True,
         before=before_log("Send action", _arrow_client_logger, logging.DEBUG),
         retry=retry_any(retry_if_exception_type(FlightTimedOutError), retry_if_exception_type(FlightUnavailableError)),
         stop=(stop_after_delay(10) | stop_after_attempt(5)),
@@ -621,6 +622,7 @@ def _send_action(self, action_type: str, meta_data: dict[str, Any]) -> dict[str,
             raise e  # unreachable
 
     @retry(
+        reraise=True,
         before=before_log("Do put", _arrow_client_logger, logging.DEBUG),
         retry=retry_any(retry_if_exception_type(FlightTimedOutError), retry_if_exception_type(FlightUnavailableError)),
         stop=(stop_after_delay(10) | stop_after_attempt(5)),
@@ -652,6 +654,7 @@ def _upload_data(
         put_stream, ack_stream = self._safe_do_put(upload_descriptor, batches[0].schema)
 
         @retry(
+            reraise=True,
             before=before_log("Upload batch", _arrow_client_logger, logging.DEBUG),
             stop=(stop_after_delay(10) | stop_after_attempt(5)),
             wait=wait_exponential(multiplier=1, min=1, max=10),
@@ -674,6 +677,7 @@ def upload_batch(p: RecordBatch) -> None:
             GdsArrowClient.handle_flight_error(e)
 
     @retry(
+        reraise=True,
         before=before_log("Do get", _arrow_client_logger, logging.DEBUG),
         retry=retry_any(retry_if_exception_type(FlightTimedOutError), retry_if_exception_type(FlightUnavailableError)),
         stop=(stop_after_delay(10) | stop_after_attempt(5)),

graphdatascience/query_runner/protocol/project_protocols.py

@@ -133,6 +133,7 @@ def is_not_done(result: DataFrame) -> bool:
         logger = getLogger()
 
         @retry(
+            reraise=True,
             before=before_log(f"Projection (graph: `{params['graph_name']}`)", logger, DEBUG),
             retry=retry_if_result(is_not_done),
             wait=wait_incrementing(start=0.2, increment=0.2, max=2),

graphdatascience/query_runner/protocol/write_protocols.py

@@ -142,6 +142,7 @@ def is_not_completed(result: DataFrame) -> bool:
         logger = logging.getLogger()
 
         @retry(
+            reraise=True,
             retry=retry_if_result(is_not_completed),
             wait=wait_incrementing(start=0.2, increment=0.2, max=2),
             before=before_log(