Add hint based on response code

facebookincubator · May 8, 2024 · ce52cbf · ce52cbf
1 parent 6f156cb
commit ce52cbf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/velox/connectors/hive/storage_adapters/s3fs/S3FileSystem.cpp b/velox/connectors/hive/storage_adapters/s3fs/S3FileSystem.cpp
@@ -656,7 +656,7 @@ class S3FileSystem::Impl {
         if (maxAttempts.has_value()) {
           VELOX_USER_CHECK(
               (maxAttempts.value() > 0),
-              "Invalid configuration: specify 'max-attempts' > 0.");
+              "Invalid configuration: specify 'hive.s3.max-attempts' > 0.");
           return std::make_shared<Aws::Client::StandardRetryStrategy>(
               maxAttempts.value());
         } else {
@@ -667,7 +667,7 @@ class S3FileSystem::Impl {
         if (maxAttempts.has_value()) {
           VELOX_USER_CHECK(
               (maxAttempts.value() > 0),
-              "Invalid configuration: specify 'max-attempts' > 0.");
+              "Invalid configuration: specify 'hive.s3.max-attempts' > 0.");
           return std::make_shared<Aws::Client::AdaptiveRetryStrategy>(
               maxAttempts.value());
         } else {
@@ -678,7 +678,7 @@ class S3FileSystem::Impl {
         if (maxAttempts.has_value()) {
           VELOX_USER_CHECK(
               (maxAttempts.value() > 0),
-              "Invalid configuration: specify 'max-attempts' > 0.");
+              "Invalid configuration: specify 'hive.s3.max-attempts' > 0.");
           return std::make_shared<Aws::Client::DefaultRetryStrategy>(
               maxAttempts.value());
         } else {

diff --git a/velox/connectors/hive/storage_adapters/s3fs/S3Util.h b/velox/connectors/hive/storage_adapters/s3fs/S3Util.h
@@ -171,6 +171,9 @@ inline std::string getRequestID(
           getS3BackendService(error.GetResponseHeaders()),                                                                     \
           error.GetMessage(),                                                                                                  \
           getRequestID(error.GetResponseHeaders()));                                                                           \
+      if (IsRetryableHttpResponseCode(error.GetResponseCode())) {                                                              \
+        errMsg.append("You may can try properly setting 'hive.s3.retry-mode' and increasing 'hive.s3.max-attempts'.");         \
+      }                                                                                                                        \
       if (error.GetResponseCode() == Aws::Http::HttpResponseCode::NOT_FOUND) {                                                 \
         VELOX_FILE_NOT_FOUND_ERROR(errMsg);                                                                                    \
       }                                                                                                                        \