Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cloud/src/meta-service/meta_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2567,6 +2567,14 @@ void MetaServiceImpl::get_delete_bitmap_update_lock(google::protobuf::RpcControl
<< " initiators_size=" << lock_info.initiators_size();

err = txn->commit();

if (request->lock_id() > 0 && err == TxnErrorCode::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;
}

if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::COMMIT>(err);
ss << "failed to get_delete_bitmap_update_lock, err=" << err;
Expand Down