Skip to content

[Store] Externalize S3 client config via environment variables #2649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mzygQAQ wants to merge 4 commits into
base: main
Choose a base branch
from
+44 −2
Open

[Store] Externalize S3 client config via environment variables #2649

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b729cc1
[Store] Externalize S3 client config via environment variables
mzygQAQ Jun 27, 2026
ca43c7e
[Store] Drop MOONCAKE_AWS_LOG_LEVEL and trim connection_info_
mzygQAQ Jun 27, 2026
a173d78
[Store] Apply clang-format to s3_helper.cpp
mzygQAQ Jun 27, 2026
491951f
[Store] Fix false 'invalid value' warning for when_supported checksum
mzygQAQ Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 44 additions & 2 deletions mooncake-store/src/utils/s3_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <aws/s3/model/DeleteObjectsRequest.h>
#include <aws/s3/model/ObjectIdentifier.h>
#include <aws/s3/model/Delete.h>
#include <algorithm>
#include <optional>
#include <fstream>
#include <iostream>
Expand All @@ -27,6 +28,7 @@
#include <aws/s3/model/CompleteMultipartUploadRequest.h>
#include <aws/s3/model/AbortMultipartUploadRequest.h>
#include <aws/s3/model/UploadPartRequest.h>
#include <aws/core/client/ClientConfiguration.h>
#include "utils/type_util.h"
#include "fmt/format.h"

Expand All @@ -50,6 +52,14 @@ struct S3Env {

bool use_virtual_addressing = true;

bool use_https = true;

Aws::Client::RequestChecksumCalculation request_checksum =
Aws::Client::RequestChecksumCalculation::WHEN_SUPPORTED;

Aws::Client::ResponseChecksumValidation response_checksum =
Aws::Client::ResponseChecksumValidation::WHEN_SUPPORTED;

int64_t connect_timeout_ms = kDefaultS3ConnectTimeoutMs;

int64_t request_timeout_ms = kDefaultS3RequestTimeoutMs;
Expand Down Expand Up @@ -92,6 +102,20 @@ void AssignTimeoutFromEnv(const char *env_name, int64_t default_value,
target = default_value;
}

template <typename T>
T ParseChecksumMode(const std::string &value) {
std::string lower = value;
std::transform(lower.begin(), lower.end(), lower.begin(),
[](unsigned char ch) { return std::tolower(ch); });
if (lower == "when_required") return T::WHEN_REQUIRED;
if (lower == "when_supported") return T::WHEN_SUPPORTED;
if (!lower.empty()) {
LOG(WARNING) << "Invalid value: " << value
<< ", falling back to when_supported";
}
return T::WHEN_SUPPORTED;
}

} // namespace

bool S3Helper::aws_initialized = false;
Expand All @@ -113,6 +137,21 @@ void S3Helper::InitAPI() {
AssignBoolFromEnv("MOONCAKE_AWS_USE_VIRTUAL_ADDRESSING",
s3_env.use_virtual_addressing);

AssignBoolFromEnv("MOONCAKE_AWS_S3_USE_HTTPS", s3_env.use_https);

{
std::string tmp;
AssignStringFromEnv("MOONCAKE_AWS_S3_REQUEST_CHECKSUM", tmp);
s3_env.request_checksum =
ParseChecksumMode<Aws::Client::RequestChecksumCalculation>(tmp);
}
{
std::string tmp;
AssignStringFromEnv("MOONCAKE_AWS_S3_RESPONSE_CHECKSUM", tmp);
s3_env.response_checksum =
ParseChecksumMode<Aws::Client::ResponseChecksumValidation>(tmp);
}

AssignTimeoutFromEnv("MOONCAKE_AWS_CONNECT_TIMEOUT_MS",
kDefaultS3ConnectTimeoutMs, s3_env.connect_timeout_ms);
AssignTimeoutFromEnv("MOONCAKE_AWS_REQUEST_TIMEOUT_MS",
Expand All @@ -132,7 +171,10 @@ S3Helper::S3Helper(const std::string &endpoint, const std::string &bucket,

config.connectTimeoutMs = s3_env.connect_timeout_ms;
config.requestTimeoutMs = s3_env.request_timeout_ms;
config.scheme = Aws::Http::Scheme::HTTPS;
config.scheme =
s3_env.use_https ? Aws::Http::Scheme::HTTPS : Aws::Http::Scheme::HTTP;
config.checksumConfig.requestChecksumCalculation = s3_env.request_checksum;
config.checksumConfig.responseChecksumValidation = s3_env.response_checksum;

if (!region.empty()) {
config.region = region;
Expand Down Expand Up @@ -872,4 +914,4 @@ tl::expected<void, std::string> S3Helper::DeleteObjectsWithPrefix(
return DeleteObjects(object_keys);
}

} // namespace mooncake
} // namespace mooncake
Loading