add custom config path

Author: TangSiyang2001

cloud/src/common/config.h

@@ -54,6 +54,10 @@ CONF_Int32(log_verbose_level, "5");
 // Only works when starting Cloud with --console.
 CONF_Bool(enable_file_logger, "true");
 
+// Custom conf path is default the same as conf path, and configs will be append to it.
+// Otherwise, will a new custom conf file will be created.
+CONF_String(custom_conf_path, "./conf/doris_cloud.conf");
+
 // recycler config
 CONF_mInt64(recycle_interval_seconds, "3600");
 CONF_mInt64(retention_seconds, "259200"); // 72h, global retention time

cloud/src/common/configbase.cpp

@@ -32,8 +32,6 @@
 
 namespace doris::cloud::config {
 
-std::string g_conf_path {};
-
 std::map<std::string, Register::Field>* Register::_s_field_map = nullptr;
 std::map<std::string, std::function<bool()>>* RegisterConfValidator::_s_field_validator = nullptr;
 std::map<std::string, std::string>* full_conf_map = nullptr;
@@ -412,26 +410,35 @@ bool do_set_config(const Register::Field& feild, const std::string& value, bool
     return false;
 }
 
-bool set_config(const std::string& field, const std::string& value, bool need_persist) {
+bool set_config(const std::string& field, const std::string& value, bool need_persist,
+                const std::string& custom_conf_path) {
     auto it = Register::_s_field_map->find(field);
     if (it == Register::_s_field_map->end()) {
         return false;
     }
     if (!it->second.valmutable) {
         return false;
     }
+
     Properties props;
-    if (!do_set_config(it->second, value, need_persist, props)) {
-        std::cerr << "not supported to modify: " << field << "=" << value << std::endl;
-        return false;
-    }
+    auto set_conf_func = [&]() {
+        if (!do_set_config(it->second, value, need_persist, props)) {
+            std::cerr << "not supported to modify: " << field << "=" << value << std::endl;
+            return false;
+        }
+        return true;
+    };
 
     if (need_persist) {
         // lock to make sure only one thread can modify the be_custom.conf
         std::lock_guard<std::mutex> l(conf_persist_lock);
-        return props.dump(config::g_conf_path.data());
+        if (!set_conf_func()) {
+            return false;
+        }
+        return props.dump(custom_conf_path);
     }
-    return true;
+
+    return set_conf_func();
 }
 
 } // namespace doris::cloud::config

cloud/src/common/configbase.h

@@ -26,8 +26,6 @@
 
 namespace doris::cloud::config {
 
-extern std::string g_conf_path;
-
 class Register {
 public:
     struct Field {
@@ -172,5 +170,6 @@ extern std::map<std::string, std::string>* full_conf_map;
 bool init(const char* conf_file, bool fill_conf_map = false, bool must_exist = true,
           bool set_to_default = true);
 
-bool set_config(const std::string& field, const std::string& value, bool need_persist = false);
+bool set_config(const std::string& field, const std::string& value, bool need_persist,
+                const std::string& custom_conf_path);
 } // namespace doris::cloud::config

cloud/src/main.cpp

@@ -194,9 +194,15 @@ int main(int argc, char** argv) {
         return -1;
     }
 
-    config::g_conf_path = args.get<std::string>(ARG_CONF);
-    if (!config::init(config::g_conf_path.data(), true)) {
-        std::cerr << "failed to init config file, conf=" << config::g_conf_path << std::endl;
+    auto conf_file = args.get<std::string>(ARG_CONF);
+    if (!config::init(conf_file.c_str(), true)) {
+        std::cerr << "failed to init config file, conf=" << conf_file << std::endl;
+        return -1;
+    }
+    if (!std::filesystem::equivalent(conf_file, config::custom_conf_path) &&
+        !config::init(config::custom_conf_path.c_str(), false)) {
+        std::cerr << "failed to init custom config file, conf=" << config::custom_conf_path
+                  << std::endl;
         return -1;
     }
 

cloud/src/meta-service/meta_service_http.cpp

@@ -468,7 +468,7 @@ static HttpResponse process_update_config(MetaServiceImpl* service, brpc::Contro
         }
         trim(conf_pair[0]);
         trim(conf_pair[1]);
-        if (!config::set_config(conf_pair[0], conf_pair[1], persist)) {
+        if (!config::set_config(conf_pair[0], conf_pair[1], persist, config::custom_conf_path)) {
             return http_json_reply(MetaServiceCode::INVALID_ARGUMENT,
                                    fmt::format("set {}={} failed", conf_pair[0], conf_pair[1]));
         }

cloud/test/meta_service_http_test.cpp

@@ -1663,15 +1663,16 @@ TEST(MetaServiceHttpTest, UpdateConfig) {
         ASSERT_EQ(config::recycle_interval_seconds, 3601);
     }
     {
-        config::g_conf_path = "./doris_cloud.conf";
+        auto original_conf_path = config::custom_conf_path;
+        config::custom_conf_path = "./doris_cloud.conf";
         auto [status_code, content] = ctx.query<std::string>(
                 "update_config",
                 "configs=recycle_interval_seconds=3659,retention_seconds=259219&persist=true");
         ASSERT_EQ(status_code, 200);
         ASSERT_EQ(config::recycle_interval_seconds, 3659);
         ASSERT_EQ(config::retention_seconds, 259219);
         config::Properties props;
-        ASSERT_TRUE(props.load(config::g_conf_path.data(), true));
+        ASSERT_TRUE(props.load(config::custom_conf_path.c_str(), true));
         {
             bool new_val_set = false;
             int64_t recycle_interval_s = 0;
@@ -1688,7 +1689,8 @@ TEST(MetaServiceHttpTest, UpdateConfig) {
             ASSERT_TRUE(new_val_set);
             ASSERT_EQ(retention_s, 259219);
         }
-        std::filesystem::remove(config::g_conf_path);
+        std::filesystem::remove(config::custom_conf_path);
+        config::custom_conf_path = original_conf_path;
     }
 }