This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 283654dab49 branch-3.0: [bugfix](cloud) Fix ms crash when set the
custom config path #50246 (#50513)
283654dab49 is described below
commit 283654dab49c5cf90caf96e7280c0b34a1e846bb
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Apr 29 14:15:37 2025 +0800
branch-3.0: [bugfix](cloud) Fix ms crash when set the custom config path
#50246 (#50513)
Cherry-picked from #50246
Co-authored-by: xy720 <[email protected]>
---
cloud/src/main.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud/src/main.cpp b/cloud/src/main.cpp
index 8da0436c7b3..bb1c2c3441c 100644
--- a/cloud/src/main.cpp
+++ b/cloud/src/main.cpp
@@ -198,7 +198,7 @@ int main(int argc, char** argv) {
}
auto conf_file = args.get<std::string>(ARG_CONF);
- if (!config::init(conf_file.c_str(), true)) {
+ if (!config::init(conf_file.c_str(), true, true, true)) {
std::cerr << "failed to init config file, conf=" << conf_file <<
std::endl;
return -1;
}
@@ -206,7 +206,7 @@ int main(int argc, char** argv) {
config::custom_conf_path = conf_file;
}
if (!std::filesystem::equivalent(conf_file, config::custom_conf_path) &&
- !config::init(config::custom_conf_path.c_str(), false)) {
+ !config::init(config::custom_conf_path.c_str(), true, false, false)) {
std::cerr << "failed to init custom config file, conf=" <<
config::custom_conf_path
<< std::endl;
return -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
