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

update openssl to 3.1.2 (#27399) 

deal with root path's normalization

Signed-off-by: PowderLi <min.li@zilliz.com>
pull/27540/head
PowderLi 2023-10-08 19:17:31 +08:00 committed by GitHub
parent a715165306
commit 8d3069b1db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -49,7 +49,6 @@ index_engine = knowhere
export GIT_BRANCH=master
ENABLE_AZURE = false
AZURE_OPTION := ""
ifeq (${ENABLE_AZURE}, false)
AZURE_OPTION := -Z

2
internal/core/conanfile.py
View File

@ -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",

2
internal/core/src/storage/AzureChunkManager.cpp
View File

@ -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());
}

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

@ -66,6 +66,7 @@ generateConfig(const StorageConfig& storage_config) {
AwsChunkManager::AwsChunkManager(const StorageConfig& storage_config) {
default_bucket_name_ = storage_config.bucket_name;
remote_root_path_ = storage_config.root_path;
InitSDKAPIDefault(storage_config.log_level);
@ -92,12 +93,14 @@ AwsChunkManager::AwsChunkManager(const StorageConfig& storage_config) {
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:'"
<< 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;
if (storage_config.useIAM) {
sdk_options_.httpOptions.httpClientFactory_create_fn = []() {
@ -124,12 +127,14 @@ GcpChunkManager::GcpChunkManager(const StorageConfig& storage_config) {
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:'"
<< 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;
InitSDKAPIDefault(storage_config.log_level);
@ -156,7 +161,8 @@ AliyunChunkManager::AliyunChunkManager(const StorageConfig& storage_config) {
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:'"
<< std::boolalpha << storage_config.useSSL << "']";
}

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

@ -327,7 +327,8 @@ MinioChunkManager::MinioChunkManager(const StorageConfig& storage_config)
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:'"
<< std::boolalpha << storage_config.useSSL << "']";
}
@ -360,7 +361,7 @@ uint64_t
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
<< "') not exists";
throw SegcoreError(ObjectNotExist, err_msg.str());
}

2
internal/core/src/storage/azure-blob-storage/AzureBlobChunkManager.cpp
View File

@ -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());
}

11
pkg/util/paramtable/service_param.go
View File

@ -1017,8 +1017,15 @@ func (p *MinioConfig) Init(base *BaseTable) {
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 ""
}
rootPath = strings.TrimLeft(rootPath, "/")
return path.Clean(rootPath)
},
PanicIfEmpty: false,
Doc: "The root path where the message is stored in MinIO/S3",
Export: true,