chore(storage): revert bump object_store_read_attempt_timeout_ms fr…

…om `8s` to `16s`" (#16789)
risingwavelabs · May 16, 2024 · 5ef4b28 · 5ef4b28
1 parent ee8b312
commit 5ef4b28
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/ci/workflows/pull-request.yml b/ci/workflows/pull-request.yml
@@ -97,7 +97,7 @@ steps:
           config: ci/docker-compose.yml
           mount-buildkite-agent: true
       - ./ci/plugins/upload-failure-logs
-    timeout_in_minutes: 23
+    timeout_in_minutes: 21
     retry: *auto-retry
 
   - label: "end-to-end test (parallel)"

diff --git a/src/common/src/config.rs b/src/common/src/config.rs
@@ -1751,7 +1751,7 @@ pub mod default {
     pub mod object_store_config {
         const DEFAULT_REQ_BACKOFF_INTERVAL_MS: u64 = 1000; // 1s
         const DEFAULT_REQ_BACKOFF_MAX_DELAY_MS: u64 = 10 * 1000; // 10s
-        const DEFAULT_REQ_MAX_RETRY_ATTEMPTS: usize = 5;
+        const DEFAULT_REQ_MAX_RETRY_ATTEMPTS: usize = 3;
 
         pub fn object_store_set_atomic_write_dir() -> bool {
             false
@@ -1779,7 +1779,7 @@ pub mod default {
 
         // init + upload_part + finish
         pub fn object_store_streaming_upload_attempt_timeout_ms() -> u64 {
-            10 * 1000 // 10s
+            5 * 1000 // 5s
         }
 
         pub fn object_store_streaming_upload_retry_attempts() -> usize {
@@ -1788,7 +1788,7 @@ pub mod default {
 
         // tips: depend on block_size
         pub fn object_store_read_attempt_timeout_ms() -> u64 {
-            16 * 1000 // 16s
+            8 * 1000 // 8s
         }
 
         pub fn object_store_read_retry_attempts() -> usize {

diff --git a/src/config/example.toml b/src/config/example.toml
@@ -192,21 +192,21 @@ req_backoff_interval_ms = 1000
 req_backoff_max_delay_ms = 10000
 req_backoff_factor = 2
 upload_attempt_timeout_ms = 8000
-upload_retry_attempts = 5
-streaming_upload_attempt_timeout_ms = 10000
-streaming_upload_retry_attempts = 5
-read_attempt_timeout_ms = 16000
-read_retry_attempts = 5
+upload_retry_attempts = 3
+streaming_upload_attempt_timeout_ms = 5000
+streaming_upload_retry_attempts = 3
+read_attempt_timeout_ms = 8000
+read_retry_attempts = 3
 streaming_read_attempt_timeout_ms = 3000
-streaming_read_retry_attempts = 5
+streaming_read_retry_attempts = 3
 metadata_attempt_timeout_ms = 60000
-metadata_retry_attempts = 5
+metadata_retry_attempts = 3
 delete_attempt_timeout_ms = 5000
-delete_retry_attempts = 5
+delete_retry_attempts = 3
 delete_objects_attempt_timeout_ms = 5000
-delete_objects_retry_attempts = 5
+delete_objects_retry_attempts = 3
 list_attempt_timeout_ms = 600000
-list_retry_attempts = 5
+list_retry_attempts = 3
 
 [storage.object_store.s3]
 object_store_keepalive_ms = 600000