[data_storage] add vipserver_domain for tairmempool in storage config (#13)

Author: lucky-zzz

kv_cache_manager/data_storage/storage_config.cc

@@ -107,7 +107,8 @@ bool MooncakeStorageSpec::ValidateRequiredFields(std::string &invalid_fields) co
 }
 std::string TairMemPoolStorageSpec::ToString() const {
     std::ostringstream oss;
-    oss << "enable_vipserver: " << enable_vipserver_ << ", domain: " << domain_ << ", timeout: " << timeout_;
+    oss << "enable_vipserver: " << enable_vipserver_ << ", domain: " << domain_
+        << ", vipserver_domain: " << vipserver_domain_ << ", timeout: " << timeout_;
     return oss.str();
 }
 bool TairMemPoolStorageSpec::ValidateRequiredFields(std::string &invalid_fields) const {
@@ -242,13 +243,15 @@ void MooncakeStorageSpec::ToRapidWriter(rapidjson::Writer<rapidjson::StringBuffe
 // TairMemPoolStorageSpec
 bool TairMemPoolStorageSpec::FromRapidValue(const rapidjson::Value &rapid_value) {
     KVCM_JSON_GET_MACRO(rapid_value, "enable_vipserver", enable_vipserver_);
+    KVCM_JSON_GET_MACRO(rapid_value, "vipserver_domain", vipserver_domain_);
     KVCM_JSON_GET_MACRO(rapid_value, "domain", domain_);
     KVCM_JSON_GET_MACRO(rapid_value, "timeout", timeout_);
     return true;
 }
 
 void TairMemPoolStorageSpec::ToRapidWriter(rapidjson::Writer<rapidjson::StringBuffer> &writer) const noexcept {
     Put(writer, "enable_vipserver", enable_vipserver_);
+    Put(writer, "vipserver_domain", vipserver_domain_);
     Put(writer, "domain", domain_);
     Put(writer, "timeout", timeout_);
 }

kv_cache_manager/data_storage/storage_config.h

@@ -127,15 +127,18 @@ class TairMemPoolStorageSpec : public StorageSpec {
     std::string ToString() const override;
     const std::string &cluster_name() const { return cluster_name_; }
     const std::string &domain() const { return domain_; }
+    const std::string &vipserver_domain() const { return vipserver_domain_; }
     int64_t timeout() const { return timeout_; }
     const bool enable_vipserver() const { return enable_vipserver_; }
     void set_domain(const std::string &domain) { domain_ = domain; }
+    void set_vipserver_domain(const std::string &vipserver_domain) { vipserver_domain_ = vipserver_domain; }
     void set_cluster_name(const std::string &cluster_name) { cluster_name_ = cluster_name; }
     void set_timeout(int64_t timeout) { timeout_ = timeout; }
     void set_enable_vipserver(bool enable_vipserver) { enable_vipserver_ = enable_vipserver; }
 
 private:
-    std::string domain_;            // metaservice域名
+    std::string domain_;            // 统一接入
+    std::string vipserver_domain_;  // vipserver
     int64_t timeout_{0};            // 目前连接超时、请求超时时间的值一样
     bool enable_vipserver_ = false; // 是否使用vipserver
     std::string cluster_name_;      // TODO proto中没有这个字段并且未使用，考虑删除

kv_cache_manager/protocol/protobuf/admin_service.proto

@@ -80,6 +80,7 @@ message TairMemPoolStorageSpec {
     string domain = 1; // tair mempool的 meta service挂载的域名
     int32 timeout = 2; // 单位超时时间
     bool enable_vipserver = 3;
+    string vipserver_domain = 4;
 }
 
 message NfsStorageSpec {

kv_cache_manager/protocol/protobuf/meta_service.proto

@@ -129,6 +129,7 @@ message TairMemPoolStorageSpec {
     string domain = 1; // tair mempool的 meta service挂载的域名
     int32 timeout = 2; // 单位超时时间
     bool enable_vipserver = 3;
+    string vipserver_domain = 4;
 }
 
 message NfsStorageSpec {

kv_cache_manager/service/util/manager_message_proto_util.cc

@@ -47,6 +47,7 @@ void ProtoConvert::StorageConfigToProto(const StorageConfig &storage_config,
         // proto_storage_config->set_global_unique_name(tair_mem_pool_storage.get_global_unique_name());
         auto *tair_mem_pool = proto_storage_config->mutable_tair_mem_pool();
         tair_mem_pool->set_domain(tair_mem_pool_storage.domain());
+        tair_mem_pool->set_vipserver_domain(tair_mem_pool_storage.vipserver_domain());
         tair_mem_pool->set_timeout(tair_mem_pool_storage.timeout());
         tair_mem_pool->set_enable_vipserver(tair_mem_pool_storage.enable_vipserver());
     } else if (type == DataStorageType::DATA_STORAGE_TYPE_NFS) {
@@ -103,6 +104,7 @@ void ProtoConvert::StorageFromProto(const proto::admin::StorageConfig *proto_sto
     case proto::admin::StorageConfig::kTairMemPool: {
         TairMemPoolStorageSpec spec;
         spec.set_domain(proto_storage_config->tair_mem_pool().domain());
+        spec.set_vipserver_domain(proto_storage_config->tair_mem_pool().vipserver_domain());
         spec.set_timeout(proto_storage_config->tair_mem_pool().timeout());
         spec.set_enable_vipserver(proto_storage_config->tair_mem_pool().enable_vipserver());
         storage_config.set_storage_spec(std::make_shared<TairMemPoolStorageSpec>(spec));