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 35e31d74e04 branch-3.1: [Opt](cloud-mow) Retry to commit txn when
encounter stale calc delete bitmap response regardless of status code #52547
(#52847)
35e31d74e04 is described below
commit 35e31d74e0439667a925ef539ca8c34c4521c682
Author: bobhan1 <[email protected]>
AuthorDate: Tue Jul 8 14:25:04 2025 +0800
branch-3.1: [Opt](cloud-mow) Retry to commit txn when encounter stale calc
delete bitmap response regardless of status code #52547 (#52847)
pick #52547
---
.../src/main/java/org/apache/doris/master/MasterImpl.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java
index 213984ae982..ad4f1a1bacd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java
@@ -683,12 +683,8 @@ public class MasterImpl {
// and if meta is missing, we no longer need to resend this task
try {
CalcDeleteBitmapTask calcDeleteBitmapTask = (CalcDeleteBitmapTask)
task;
- if (request.getTaskStatus().getStatusCode() != TStatusCode.OK) {
-
calcDeleteBitmapTask.countDownToZero(request.getTaskStatus().getStatusCode(),
- "backend: " + task.getBackendId() + ",
error_tablet_size: "
- + request.getErrorTabletIdsSize() + ",
err_msg: "
- +
request.getTaskStatus().getErrorMsgs().toString());
- } else if (request.isSetRespPartitions()
+ // check if the request is stale first, if so, let it retry
regardless of the status code
+ if (request.isSetRespPartitions()
&&
calcDeleteBitmapTask.isFinishRequestStale(request.getRespPartitions())) {
LOG.warn("get staled response from backend: {}, report
version: {}. calcDeleteBitmapTask's"
+ "partitionInfos: {}. response's partitionInfos: {}",
task.getBackendId(),
@@ -699,6 +695,11 @@ public class MasterImpl {
calcDeleteBitmapTask.countDownToZero(TStatusCode.DELETE_BITMAP_LOCK_ERROR,
"get staled response from backend " +
task.getBackendId() + ", report version: "
+ request.getReportVersion());
+ } else if (request.getTaskStatus().getStatusCode() !=
TStatusCode.OK) {
+
calcDeleteBitmapTask.countDownToZero(request.getTaskStatus().getStatusCode(),
+ "backend: " + task.getBackendId() + ",
error_tablet_size: " + request.getErrorTabletIdsSize()
+ + ", error_tablets: " +
request.getErrorTabletIds()
+ + ", err_msg: " +
request.getTaskStatus().getErrorMsgs().toString());
} else {
calcDeleteBitmapTask.countDownLatch(task.getBackendId(),
calcDeleteBitmapTask.getTransactionId());
if (LOG.isDebugEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
