This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 950c820734fa42a4aadcec31026a772b4dc0fd8e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Sep 10 07:44:34 2026 +0800
branch-4.1: [Improve](cloud) Only register watershed txn id once when BE
enters decommissioning state #67322 (#67632)
Cherry-picked from #67322
Co-authored-by: shee <[email protected]>
---
.../java/org/apache/doris/cloud/catalog/CloudClusterChecker.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudClusterChecker.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudClusterChecker.java
index 0445d48545c..c8eee36f505 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudClusterChecker.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudClusterChecker.java
@@ -185,14 +185,14 @@ public class CloudClusterChecker extends MasterDaemon {
}
if (status == Cloud.NodeStatusPB.NODE_STATUS_DECOMMISSIONING) {
- if (!be.isDecommissioned()) {
- LOG.info("decommissioned backend: {} status: {}", be,
status);
+ if (!be.isDecommissioning()) {
+ LOG.info("decommissioning backend: {} status: {}", be,
status);
try {
((CloudEnv)
Env.getCurrentEnv()).getCloudUpgradeMgr().registerWaterShedTxnId(be.getId());
+ be.setDecommissioning(true);
} catch (UserException e) {
LOG.warn("failed to register water shed txn id,
decommission be {}", be.getId(), e);
}
- be.setDecommissioning(true);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
