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

storage: s3_address support domain/hostname. (#5413) 

In most cases, it is more appropriate to use the hostname or domain name
as the address of the S3 server.

Signed-off-by: Ji Bin <matrixji@live.com>
pull/5459/head
Ji Bin 2021-05-27 16:32:32 +08:00 committed by GitHub
parent cc066e5f5c
commit 930600371d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/config/Config.cpp
View File

@ -1297,7 +1297,7 @@ Config::CheckStorageConfigS3Enable(const std::string& value) {
Status
Config::CheckStorageConfigS3Address(const std::string& value) {
if (!ValidationUtil::ValidateIpAddress(value).ok()) {
if (!ValidationUtil::ValidateHostname(value).ok()) {
std::string msg = "Invalid s3 address: " + value + ". Possible reason: storage_config.s3_address is invalid.";
return Status(SERVER_INVALID_ARGUMENT, msg);
}

13
core/src/utils/ValidationUtil.cpp
View File

@ -19,6 +19,7 @@
#include "utils/StringHelpFunctions.h"
#include <arpa/inet.h>
#include <netdb.h>
#ifdef MILVUS_GPU_VERSION
@ -556,6 +557,18 @@ ValidationUtil::ValidateIpAddress(const std::string& ip_address) {
}
}
Status
ValidationUtil::ValidateHostname(const std::string& hostname) {
struct hostent* hent = gethostbyname(hostname.c_str());
fiu_do_on("ValidationUtil.ValidateHostname.invalid_hostname", hent = nullptr);
if (!hent) {
std::string msg = "Unresolvable hostname: " + hostname;
LOG_SERVER_ERROR_ << msg;
return Status(SERVER_INVALID_ARGUMENT, msg);
}
return Status::OK();
}
Status
ValidationUtil::ValidateStringIsNumber(const std::string& str) {
if (str.empty() || !std::all_of(str.begin(), str.end(), ::isdigit)) {

3
core/src/utils/ValidationUtil.h
View File

@ -80,6 +80,9 @@ class ValidationUtil {
static Status
ValidateIpAddress(const std::string& ip_address);
static Status
ValidateHostname(const std::string& hostname);
static Status
ValidateStringIsNumber(const std::string& str);

12
core/unittest/server/test_util.cpp
View File

@ -745,6 +745,18 @@ TEST(ValidationUtilTest, VALIDATE_IPADDRESS_TEST) {
fiu_disable("ValidationUtil.ValidateIpAddress.error_ip_result");
}
TEST(ValidationUtilTest, VALIDATE_HOSTNAME_TEST) {
ASSERT_EQ(milvus::server::ValidationUtil::ValidateHostname("127.0.0.1").code(), milvus::SERVER_SUCCESS);
ASSERT_EQ(milvus::server::ValidationUtil::ValidateHostname("localhost").code(), milvus::SERVER_SUCCESS);
ASSERT_EQ(milvus::server::ValidationUtil::ValidateHostname("192.168.100.100").code(), milvus::SERVER_SUCCESS);
ASSERT_NE(milvus::server::ValidationUtil::ValidateHostname("not a domain").code(), milvus::SERVER_SUCCESS);
fiu_init(0);
fiu_enable("ValidationUtil.ValidateHostname.invalid_hostname", 1, NULL, 0);
ASSERT_NE(milvus::server::ValidationUtil::ValidateIpAddress("not a hostname").code(), milvus::SERVER_SUCCESS);
fiu_disable("ValidationUtil.ValidateHostname.invalid_hostname");
}
TEST(ValidationUtilTest, VALIDATE_NUMBER_TEST) {
ASSERT_EQ(milvus::server::ValidationUtil::ValidateStringIsNumber("1234").code(), milvus::SERVER_SUCCESS);
ASSERT_NE(milvus::server::ValidationUtil::ValidateStringIsNumber("not number").code(), milvus::SERVER_SUCCESS);