Skip to content

Commit fc6f60b

Browse files
rock-gitchuandew
authored andcommitted
[fix][mds] Fixup txn PushMinCommitTs issues.
1 parent c43759a commit fc6f60b

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/client/vfs/meta/v2/rpc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ Status RPC::SendRequest(const EndPoint& endpoint,
329329

330330
// the errno of need retry
331331
if (response.error().errcode() != pb::error::EINTERNAL &&
332+
response.error().errcode() != pb::error::EREQUEST_FULL &&
332333
response.error().errcode() != pb::error::EBACKEND_STORE) {
333334
break;
334335
}

src/mds/storage/dingodb_storage.cc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ static inline Status TransformStatus(const dingodb::sdk::Status& status) {
251251
g_txn_memlock_conflict_per_second << 1;
252252
return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
253253

254+
} else if (status.IsPushMinCommitTs()) {
255+
g_txn_total_conflict_per_second << 1;
256+
return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
257+
254258
} else {
255259
return Status(pb::error::EBACKEND_STORE, status.ToString());
256260
}
@@ -501,6 +505,11 @@ Status DingodbTxn::TransformStatus(const dingodb::sdk::Status& status) {
501505
txn_trace_.is_conflict = true;
502506
return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
503507

508+
} else if (status.IsPushMinCommitTs()) {
509+
g_txn_total_conflict_per_second << 1;
510+
txn_trace_.is_conflict = true;
511+
return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
512+
504513
} else {
505514
return Status(pb::error::EBACKEND_STORE, status.ToString());
506515
}

0 commit comments

Comments
 (0)