Skip to content
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

update openssl to 3.1.2 #27399

Merged
merged 1 commit into from
Oct 8, 2023
Merged

update openssl to 3.1.2 #27399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ index_engine = knowhere

export GIT_BRANCH=master

ENABLE_AZURE = false
AZURE_OPTION := ""
ifeq (${ENABLE_AZURE}, false)
AZURE_OPTION := -Z
Expand Down
2 changes: 1 addition & 1 deletion internal/core/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class MilvusConan(ConanFile):
"snappy/1.1.9",
"lzo/2.10",
"arrow/11.0.0",
"openssl/1.1.1q",
"openssl/3.1.2",
"s2n/1.3.31@milvus/dev",
"aws-c-common/0.8.2@milvus/dev",
"aws-c-compression/0.2.15@milvus/dev",
Expand Down
2 changes: 1 addition & 1 deletion internal/core/src/storage/AzureChunkManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ uint64_t
AzureChunkManager::Read(const std::string& filepath, void* buf, uint64_t size) {
if (!ObjectExists(default_bucket_name_, filepath)) {
std::stringstream err_msg;
err_msg << "object('" << default_bucket_name_ << "', " << filepath
err_msg << "object('" << default_bucket_name_ << "', '" << filepath
<< "') not exists";
throw SegcoreError(ObjectNotExist, err_msg.str());
}
Expand Down
12 changes: 9 additions & 3 deletions internal/core/src/storage/ChunkManagers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@

AwsChunkManager::AwsChunkManager(const StorageConfig& storage_config) {
default_bucket_name_ = storage_config.bucket_name;
remote_root_path_ = storage_config.root_path;

Check warning on line 69 in internal/core/src/storage/ChunkManagers.cpp

View check run for this annotation

Codecov / codecov/patch

internal/core/src/storage/ChunkManagers.cpp#L69 

Added line #L69 was not covered by tests

InitSDKAPIDefault(storage_config.log_level);

Expand All @@ -92,12 +93,14 @@

LOG_SEGCORE_INFO_ << "init AwsChunkManager with parameter[endpoint: '"
<< storage_config.address << "', default_bucket_name:'"
<< storage_config.bucket_name << "', use_secure:'"
<< storage_config.bucket_name << "', root_path:'"
<< storage_config.root_path << "', use_secure:'"

Check warning on line 97 in internal/core/src/storage/ChunkManagers.cpp

View check run for this annotation

Codecov / codecov/patch

internal/core/src/storage/ChunkManagers.cpp#L96-L97 

Added lines #L96 - L97 were not covered by tests
<< std::boolalpha << storage_config.useSSL << "']";
}

GcpChunkManager::GcpChunkManager(const StorageConfig& storage_config) {
default_bucket_name_ = storage_config.bucket_name;
remote_root_path_ = storage_config.root_path;

Check warning on line 103 in internal/core/src/storage/ChunkManagers.cpp

View check run for this annotation

Codecov / codecov/patch

internal/core/src/storage/ChunkManagers.cpp#L103 

Added line #L103 was not covered by tests

if (storage_config.useIAM) {
sdk_options_.httpOptions.httpClientFactory_create_fn = []() {
Expand All @@ -124,12 +127,14 @@

LOG_SEGCORE_INFO_ << "init GcpChunkManager with parameter[endpoint: '"
<< storage_config.address << "', default_bucket_name:'"
<< storage_config.bucket_name << "', use_secure:'"
<< storage_config.bucket_name << "', root_path:'"
<< storage_config.root_path << "', use_secure:'"

Check warning on line 131 in internal/core/src/storage/ChunkManagers.cpp

View check run for this annotation

Codecov / codecov/patch

internal/core/src/storage/ChunkManagers.cpp#L130-L131 

Added lines #L130 - L131 were not covered by tests
<< std::boolalpha << storage_config.useSSL << "']";
}

AliyunChunkManager::AliyunChunkManager(const StorageConfig& storage_config) {
default_bucket_name_ = storage_config.bucket_name;
remote_root_path_ = storage_config.root_path;

Check warning on line 137 in internal/core/src/storage/ChunkManagers.cpp

View check run for this annotation

Codecov / codecov/patch

internal/core/src/storage/ChunkManagers.cpp#L137 

Added line #L137 was not covered by tests

InitSDKAPIDefault(storage_config.log_level);

Expand All @@ -156,7 +161,8 @@

LOG_SEGCORE_INFO_ << "init AliyunChunkManager with parameter[endpoint: '"
<< storage_config.address << "', default_bucket_name:'"
<< storage_config.bucket_name << "', use_secure:'"
<< storage_config.bucket_name << "', root_path:'"
<< storage_config.root_path << "', use_secure:'"

Check warning on line 165 in internal/core/src/storage/ChunkManagers.cpp

View check run for this annotation

Codecov / codecov/patch

internal/core/src/storage/ChunkManagers.cpp#L164-L165 

Added lines #L164 - L165 were not covered by tests
<< std::boolalpha << storage_config.useSSL << "']";
}

Expand Down
5 changes: 3 additions & 2 deletions internal/core/src/storage/MinioChunkManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@

LOG_SEGCORE_INFO_ << "init MinioChunkManager with parameter[endpoint: '"
<< storage_config.address << "', default_bucket_name:'"
<< storage_config.bucket_name << "', use_secure:'"
<< storage_config.bucket_name << "', root_path:'"
<< storage_config.root_path << "', use_secure:'"

Check warning on line 331 in internal/core/src/storage/MinioChunkManager.cpp

View check run for this annotation

Codecov / codecov/patch

internal/core/src/storage/MinioChunkManager.cpp#L330-L331 

Added lines #L330 - L331 were not covered by tests
<< std::boolalpha << storage_config.useSSL << "']";
}

Expand Down Expand Up @@ -360,7 +361,7 @@
MinioChunkManager::Read(const std::string& filepath, void* buf, uint64_t size) {
if (!ObjectExists(default_bucket_name_, filepath)) {
std::stringstream err_msg;
err_msg << "object('" << default_bucket_name_ << "', " << filepath
err_msg << "object('" << default_bucket_name_ << "', '" << filepath

Check warning on line 364 in internal/core/src/storage/MinioChunkManager.cpp

View check run for this annotation

Codecov / codecov/patch

internal/core/src/storage/MinioChunkManager.cpp#L364 

Added line #L364 was not covered by tests
<< "') not exists";
throw SegcoreError(ObjectNotExist, err_msg.str());
}
Expand Down
2 changes: 1 addition & 1 deletion internal/core/src/storage/azure-blob-storage/AzureBlobChunkManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ AzureBlobChunkManager::GetObjectSize(const std::string& bucket_name,
}
}
std::stringstream err_msg;
err_msg << "object('" << bucket_name << "', " << object_name
err_msg << "object('" << bucket_name << "', '" << object_name
<< "') not exists";
throw std::runtime_error(err_msg.str());
}
Expand Down
11 changes: 9 additions & 2 deletions pkg/util/paramtable/service_param.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,8 +1017,15 @@
p.BucketName.Init(base.mgr)

p.RootPath = ParamItem{
Key: "minio.rootPath",
Version: "2.0.0",
Key: "minio.rootPath",
Version: "2.0.0",
Formatter: func(rootPath string) string {
if rootPath == "" {
return ""
}

Check warning on line 1025 in pkg/util/paramtable/service_param.go

View check run for this annotation

Codecov / codecov/patch

pkg/util/paramtable/service_param.go#L1024-L1025 

Added lines #L1024 - L1025 were not covered by tests
rootPath = strings.TrimLeft(rootPath, "/")
return path.Clean(rootPath)
},
PanicIfEmpty: false,
Doc: "The root path where the message is stored in MinIO/S3",
Export: true,
Expand Down
Loading