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 795c9945f61 branch-3.1: [Opt](cloud-mow) Skip MS RPC retry's backoff
when encounter fdb txn conflict when mow load get ms delete bitmap lock #52360
(#52437)
795c9945f61 is described below
commit 795c9945f61061073336a69ffe0199ff2105bc4a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Jun 30 18:56:00 2025 +0800
branch-3.1: [Opt](cloud-mow) Skip MS RPC retry's backoff when encounter fdb
txn conflict when mow load get ms delete bitmap lock #52360 (#52437)
Cherry-picked from #52360
Co-authored-by: bobhan1 <[email protected]>
---
cloud/src/meta-service/meta_service.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/cloud/src/meta-service/meta_service.cpp
b/cloud/src/meta-service/meta_service.cpp
index 962c4b0efcf..80203731f5f 100644
--- a/cloud/src/meta-service/meta_service.cpp
+++ b/cloud/src/meta-service/meta_service.cpp
@@ -3342,6 +3342,13 @@ void
MetaServiceImpl::get_delete_bitmap_update_lock(google::protobuf::RpcControl
get_delete_bitmap_update_lock_v1(controller, request, response, done,
instance_id, code,
msg, ss);
}
+
+ if (request->lock_id() > 0 && code == MetaServiceCode::KV_TXN_CONFLICT) {
+ // For load, the only fdb txn conflict here is due to compaction(sc)
job.
+ // We turn it into a lock conflict error to skip the MS RPC backoff
becasue it's too long
+ // and totally let FE to control the retry backoff sleep time
+ code = MetaServiceCode::LOCK_CONFLICT;
+ }
}
void MetaServiceImpl::remove_delete_bitmap_update_lock(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
