milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Force set aliyun use_virtual_host to true for all (#28237) 

Signed-off-by: luzhang <luzhang@zilliz.com>
Co-authored-by: luzhang <luzhang@zilliz.com>
pull/28267/head
zhagnlu 2023-11-08 11:10:21 +08:00 committed by GitHub
parent 1944e955cb
commit 99350b1be4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/core/src/storage/ChunkManagers.cpp
View File

@ -145,6 +145,10 @@ AliyunChunkManager::AliyunChunkManager(const StorageConfig& storage_config) {
InitSDKAPIDefault(storage_config.log_level);
Aws::Client::ClientConfiguration config = generateConfig(storage_config);
// For aliyun oss, support use virtual host mode
StorageConfig mutable_config = storage_config;
mutable_config.useVirtualHost = true;
if (storage_config.useIAM) {
auto aliyun_provider = Aws::MakeShared<
Aws::Auth::AliyunSTSAssumeRoleWebIdentityCredentialsProvider>(
@ -160,9 +164,9 @@ AliyunChunkManager::AliyunChunkManager(const StorageConfig& storage_config) {
aliyun_provider,
config,
Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
storage_config.useVirtualHost);
mutable_config.useVirtualHost);
} else {
BuildAccessKeyClient(storage_config, config);
BuildAccessKeyClient(mutable_config, config);
}
LOG_SEGCORE_INFO_ << "init AliyunChunkManager with parameter[endpoint: '"

7
internal/core/src/storage/MinioChunkManager.cpp
View File

@ -238,6 +238,9 @@ void
MinioChunkManager::BuildAliyunCloudClient(
const StorageConfig& storage_config,
const Aws::Client::ClientConfiguration& config) {
// For aliyun oss, support use virtual host mode
StorageConfig mutable_config = storage_config;
mutable_config.useVirtualHost = true;
if (storage_config.useIAM) {
auto aliyun_provider = Aws::MakeShared<
Aws::Auth::AliyunSTSAssumeRoleWebIdentityCredentialsProvider>(
@ -253,9 +256,9 @@ MinioChunkManager::BuildAliyunCloudClient(
aliyun_provider,
config,
Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
storage_config.useVirtualHost);
mutable_config.useVirtualHost);
} else {
BuildAccessKeyClient(storage_config, config);
BuildAccessKeyClient(mutable_config, config);
}
}