This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 847c749193e branch-3.1: [fix](docker case) Fix some docker case #53404
(#53720)
847c749193e is described below
commit 847c749193e4426a3ef7b020a3701322ecd6a30f
Author: deardeng <[email protected]>
AuthorDate: Wed Jul 23 10:33:10 2025 +0800
branch-3.1: [fix](docker case) Fix some docker case #53404 (#53720)
cherry pick from #53404
---
cloud/src/common/config.h | 1 +
cloud/src/resource-manager/resource_manager.cpp | 6 ++++--
docker/runtime/doris-compose/cluster.py | 2 +-
.../suites/cloud_p0/multi_cluster/test_multi_follower.groovy | 5 ++++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cloud/src/common/config.h b/cloud/src/common/config.h
index 79ce4b611e1..08ed29267f0 100644
--- a/cloud/src/common/config.h
+++ b/cloud/src/common/config.h
@@ -335,4 +335,5 @@ CONF_mString(ca_cert_file_paths,
"/etc/pki/tls/certs/ca-bundle.crt;/etc/ssl/certs/ca-certificates.crt;"
"/etc/ssl/ca-bundle.pem");
+CONF_Bool(enable_check_fe_drop_in_safe_time, "true");
} // namespace doris::cloud::config
diff --git a/cloud/src/resource-manager/resource_manager.cpp
b/cloud/src/resource-manager/resource_manager.cpp
index 0e4133d0198..b6f184929ac 100644
--- a/cloud/src/resource-manager/resource_manager.cpp
+++ b/cloud/src/resource-manager/resource_manager.cpp
@@ -687,7 +687,8 @@ std::pair<MetaServiceCode, std::string>
ResourceManager::drop_cluster(
if (i.type() == ClusterPB::SQL) {
for (auto& fe_node : i.nodes()) {
// check drop fe cluster
- if (!is_sql_node_exceeded_safe_drop_time(fe_node)) {
+ if (config::enable_check_fe_drop_in_safe_time &&
+ !is_sql_node_exceeded_safe_drop_time(fe_node)) {
ss << "drop fe cluster not in safe time, try later,
cluster="
<< i.DebugString();
msg = ss.str();
@@ -1350,7 +1351,8 @@ std::string ResourceManager::modify_nodes(const
std::string& instance_id,
}
// check drop fe node
- if (ClusterPB::SQL == c.type() &&
!is_sql_node_exceeded_safe_drop_time(copy_node)) {
+ if (ClusterPB::SQL == c.type() &&
config::enable_check_fe_drop_in_safe_time &&
+ !is_sql_node_exceeded_safe_drop_time(copy_node)) {
s << "drop fe node not in safe time, try later, node=" <<
copy_node.DebugString();
err = s.str();
LOG(WARNING) << err;
diff --git a/docker/runtime/doris-compose/cluster.py
b/docker/runtime/doris-compose/cluster.py
index 00fe9ddc386..8d4d65097e9 100644
--- a/docker/runtime/doris-compose/cluster.py
+++ b/docker/runtime/doris-compose/cluster.py
@@ -547,7 +547,7 @@ class FE(Node):
if self.cluster.is_cloud:
envs["CLOUD_UNIQUE_ID"] = self.cloud_unique_id()
if self.meta["is_cloud_follower"]:
- envs["is_fe_follower"] = 1
+ envs["IS_FE_FOLLOWER"] = 1
envs["MY_QUERY_PORT"] = self.meta["ports"]["query_port"]
envs["MY_EDITLOG_PORT"] = self.meta["ports"]["edit_log_port"]
return envs
diff --git
a/regression-test/suites/cloud_p0/multi_cluster/test_multi_follower.groovy
b/regression-test/suites/cloud_p0/multi_cluster/test_multi_follower.groovy
index 1b7f33fdb1d..d524eb08bd1 100644
--- a/regression-test/suites/cloud_p0/multi_cluster/test_multi_follower.groovy
+++ b/regression-test/suites/cloud_p0/multi_cluster/test_multi_follower.groovy
@@ -30,6 +30,9 @@ suite('test_multi_followr_in_cloud', 'multi_cluster, docker')
{
'sys_log_verbose_modules=org',
'heartbeat_interval_second=1'
]
+ options.msConfigs += [
+ 'enable_check_fe_drop_in_safe_time=false'
+ ]
options.setFeNum(3)
options.setBeNum(1)
options.cloudMode = true
@@ -99,7 +102,7 @@ suite('test_multi_followr_in_cloud', 'multi_cluster,
docker') {
logger.info("ms addr={}, port={}", ms.host, ms.httpPort)
// drop a follwer
def findToDropUniqueId = { clusterId, hostIP, metaServices ->
- ret = get_instance(metaServices)
+ def ret = get_instance(metaServices)
def toDropCluster = ret.clusters.find {
it.cluster_id.contains(clusterId)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
