mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-15 17:51:06 +00:00
Code Activity

feat(aws): add https support (#2061)

Browse source
This commit is contained in:
Andy Dunstall 2023-10-24 11:31:05 +01:00 committed by GitHub
parent dc025e5f94
commit 1a813ce1b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
helio

@ -1 +1 @@
Subproject commit 3b3bc22b8af3fd5747836bf029b197a319679491
Subproject commit 8faa1d44d5b9843841ca9f3f282bd89c6048aba0

9
src/server/detail/snapshot_storage.cc
View file

@ -175,8 +175,8 @@ io::Result<std::vector<std::string>, GenericError> FileSnapshotStorage::LoadPath
return paths;
}
AwsS3SnapshotStorage::AwsS3SnapshotStorage(const std::string& endpoint, bool ec2_metadata,
bool sign_payload) {
AwsS3SnapshotStorage::AwsS3SnapshotStorage(const std::string& endpoint, bool https,
bool ec2_metadata, bool sign_payload) {
shard_set->pool()->GetNextProactor()->Await([&] {
if (!ec2_metadata) {
setenv("AWS_EC2_METADATA_DISABLED", "true", 0);
@ -184,7 +184,8 @@ AwsS3SnapshotStorage::AwsS3SnapshotStorage(const std::string& endpoint, bool ec2
// S3ClientConfiguration may request configuration and credentials from
// EC2 metadata so must be run in a proactor thread.
Aws::S3::S3ClientConfiguration s3_conf{};
LOG(INFO) << "Creating AWS S3 client; region=" << s3_conf.region << "; endpoint=" << endpoint;
LOG(INFO) << "Creating AWS S3 client; region=" << s3_conf.region << "; https=" << std::boolalpha
<< https << "; endpoint=" << endpoint;
if (!sign_payload) {
s3_conf.payloadSigningPolicy = Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::ForceNever;
}
@ -192,7 +193,7 @@ AwsS3SnapshotStorage::AwsS3SnapshotStorage(const std::string& endpoint, bool ec2
std::make_shared<util::aws::CredentialsProviderChain>();
// Pass a custom endpoint. If empty uses the S3 endpoint.
std::shared_ptr<Aws::S3::S3EndpointProviderBase> endpoint_provider =
std::make_shared<util::aws::S3EndpointProvider>(endpoint);
std::make_shared<util::aws::S3EndpointProvider>(endpoint, https);
s3_ = std::make_shared<Aws::S3::S3Client>(credentials_provider, endpoint_provider, s3_conf);
});
}

3
src/server/detail/snapshot_storage.h
View file

@ -72,7 +72,8 @@ class FileSnapshotStorage : public SnapshotStorage {
class AwsS3SnapshotStorage : public SnapshotStorage {
public:
AwsS3SnapshotStorage(const std::string& endpoint, bool ec2_metadata, bool sign_payload);
AwsS3SnapshotStorage(const std::string& endpoint, bool https, bool ec2_metadata,
bool sign_payload);
io::Result<std::pair<io::Sink*, uint8_t>, GenericError> OpenWriteFile(
const std::string& path) override;

5
src/server/server_family.cc
View file

@ -97,6 +97,7 @@ ABSL_FLAG(int32_t, slowlog_log_slower_than, 10000,
ABSL_FLAG(uint32_t, slowlog_max_len, 20, "Slow log maximum length.");
ABSL_FLAG(string, s3_endpoint, "", "endpoint for s3 snapshots, default uses aws regional endpoint");
ABSL_FLAG(bool, s3_use_https, true, "whether to use https for s3 endpoints");
// Disable EC2 metadata by default, or if a users credentials are invalid the
// AWS client will spent 30s trying to connect to inaccessable EC2 endpoints
// to load the credentials.
@ -534,8 +535,8 @@ void ServerFamily::Init(util::AcceptServer* acceptor, std::vector<facade::Listen
if (IsCloudPath(flag_dir)) {
shard_set->pool()->GetNextProactor()->Await([&] { util::aws::Init(); });
snapshot_storage_ = std::make_shared<detail::AwsS3SnapshotStorage>(
absl::GetFlag(FLAGS_s3_endpoint), absl::GetFlag(FLAGS_s3_ec2_metadata),
absl::GetFlag(FLAGS_s3_sign_payload));
absl::GetFlag(FLAGS_s3_endpoint), absl::GetFlag(FLAGS_s3_use_https),
absl::GetFlag(FLAGS_s3_ec2_metadata), absl::GetFlag(FLAGS_s3_sign_payload));
} else if (fq_threadpool_) {
snapshot_storage_ = std::make_shared<detail::FileSnapshotStorage>(fq_threadpool_.get());
} else {