Merge pull request #20 from RelationalAI/ag-extra-retries-log

Add extra retry to error log
RelationalAI · Apr 4, 2024 · c8d365d · c8d365d
2 parents ad20145 + 3944c91
commit c8d365d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "object_store_ffi"
-version = "0.6.0"
+version = "0.6.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/src/lib.rs b/src/lib.rs
@@ -339,14 +339,20 @@ macro_rules! with_retries_and_cancellation {
                             return;
                         }
                         Err(e) => {
+                            let reason = extract_error_info(&e).reason;
                             if let Some(duration) = should_retry(retries, &e, start_instant.elapsed(), $config).await {
                                 retries += 1;
-                                tracing::info!("retrying error (reason: {:?}) after {:?}: {}", extract_error_info(&e).reason, duration, e);
+                                tracing::info!("retrying error (reason: {:?}) after {:?}: {}", reason, duration, e);
                                 tokio::time::sleep(duration).await;
                                 continue 'retry;
                             }
-                            tracing::warn!("{}", e);
-                            $response.into_error(e);
+                            let error_message = if retries > 0 {
+                                format!("{} (after {} extra retries, reason: {:?})", e, retries, reason)
+                            } else {
+                                format!("{}", e)
+                            };
+                            tracing::warn!("{}", error_message);
+                            $response.into_error(error_message);
                             return;
                         }
                     }