Skip to content
Open
Changes from 3 commits
Commits
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
53 changes: 51 additions & 2 deletions mooncake-store/src/utils/s3_helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,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 +51,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 +101,30 @@ void AssignTimeoutFromEnv(const char *env_name, int64_t default_value,
target = default_value;
}

Aws::Client::RequestChecksumCalculation ParseRequestChecksum(
const std::string &value) {
if (value == "when_required") {
return Aws::Client::RequestChecksumCalculation::WHEN_REQUIRED;
}
if (!value.empty()) {
LOG(WARNING) << "Invalid MOONCAKE_AWS_S3_REQUEST_CHECKSUM value: "
<< value << ", falling back to when_supported";
}
return Aws::Client::RequestChecksumCalculation::WHEN_SUPPORTED;
}

Aws::Client::ResponseChecksumValidation ParseResponseChecksum(
const std::string &value) {
if (value == "when_required") {
return Aws::Client::ResponseChecksumValidation::WHEN_REQUIRED;
}
if (!value.empty()) {
LOG(WARNING) << "Invalid MOONCAKE_AWS_S3_RESPONSE_CHECKSUM value: "
<< value << ", falling back to when_supported";
}
return Aws::Client::ResponseChecksumValidation::WHEN_SUPPORTED;
}
Comment thread
mzygQAQ marked this conversation as resolved.
Outdated

} // namespace

bool S3Helper::aws_initialized = false;
Expand All @@ -113,6 +146,19 @@ 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 = ParseRequestChecksum(tmp);
}
{
std::string tmp;
AssignStringFromEnv("MOONCAKE_AWS_S3_RESPONSE_CHECKSUM", tmp);
s3_env.response_checksum = ParseResponseChecksum(tmp);
}

AssignTimeoutFromEnv("MOONCAKE_AWS_CONNECT_TIMEOUT_MS",
kDefaultS3ConnectTimeoutMs, s3_env.connect_timeout_ms);
AssignTimeoutFromEnv("MOONCAKE_AWS_REQUEST_TIMEOUT_MS",
Expand All @@ -132,7 +178,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 +921,4 @@ tl::expected<void, std::string> S3Helper::DeleteObjectsWithPrefix(
return DeleteObjects(object_keys);
}

} // namespace mooncake
} // namespace mooncake
Loading