fix handle renametx retry failed with same sequence number

curvefs/src/metaserver/transaction.cpp

@@ -22,6 +22,7 @@
 
 #include "curvefs/src/metaserver/dentry_storage.h"
 #include "curvefs/src/metaserver/transaction.h"
+#include "src/common/concurrent/name_lock.h"
 
 namespace curvefs {
 namespace metaserver {
@@ -112,12 +113,16 @@ MetaStatusCode TxManager::HandleRenameTx(const std::vector<Dentry>& dentrys) {
         return rc;
     }
 
+    // deal with retry request with same tx sequence
+    curve::common::NameLockGuard lg(seqNameLock_,
+        std::to_string(dentrys[0].txsequence()));
+
     // Handle pending TX
     RenameTx pendingTx;
     if (FindPendingTx(&pendingTx)) {
         auto txId = dentrys[0].txid();
         auto txSequence = dentrys[0].txsequence();
-        if (txSequence != 0 && txSequence <= pendingTx.GetTxSequence()) {
+        if (txSequence != 0 && txSequence < pendingTx.GetTxSequence()) {
             LOG(ERROR) << "HandlePendingTx failed, current transaction is stale"
                        << ", we will discard it. current tx sequence = "
                        << txSequence << ", pending tx sequence = "

curvefs/src/metaserver/transaction.h

@@ -27,6 +27,7 @@
 #include <memory>
 #include <unordered_map>
 
+#include "src/common/concurrent/name_lock.h"
 #include "src/common/concurrent/rw_lock.h"
 #include "curvefs/src/metaserver/dentry_storage.h"
 
@@ -89,6 +90,8 @@ class TxManager {
     std::shared_ptr<DentryStorage> storage_;
 
     RenameTx EMPTY_TX, pendingTx_;
+
+    curve::common::NameLock seqNameLock_;
 };
 
 }  // namespace metaserver

curvefs/test/metaserver/transaction_test.cpp

@@ -24,6 +24,7 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <thread>
 
 #include "curvefs/src/metaserver/dentry_manager.h"
 #include "curvefs/src/metaserver/storage/storage.h"
@@ -89,14 +90,16 @@ class TransactionTest : public ::testing::Test {
                      const std::string& name,
                      uint64_t txId,
                      uint64_t inodeId,
-                     uint32_t flag) {
+                     uint32_t flag,
+                     uint64_t txSequence = 0) {
         Dentry dentry;
         dentry.set_fsid(fsId);
         dentry.set_parentinodeid(parentId);
         dentry.set_name(name);
         dentry.set_txid(txId);
         dentry.set_inodeid(inodeId);
         dentry.set_flag(flag);
+        dentry.set_txsequence(txSequence);
         return dentry;
     }
 
@@ -347,5 +350,27 @@ TEST_F(TransactionTest, HandleTxWithTargetExist) {
     ASSERT_EQ(dentryStorage_->Size(), 3);  // /B /B/A /C(pending)
 }
 
+TEST_F(TransactionTest, HandleTxWithSameSequence) {
+    InsertDentrys(dentryStorage_, std::vector<Dentry>{
+        // { fsId, parentId, name, txId, inodeId, flag }
+        GenDentry(1, 0, "A", 0, 1, 0),
+    });
+
+    // step-1: prepare tx success (rename A B)
+    auto dentrys = std::vector<Dentry> {
+        // { fsId, parentId, name, txId, inodeId, flag }
+        GenDentry(1, 0, "A", 1, 1, DELETE_FLAG, 1),
+        GenDentry(1, 0, "B", 1, 1, 0, 1),
+    };
+    MetaStatusCode rc1, rc2;
+    std::thread t1([&]() {rc1 = txManager_->HandleRenameTx(dentrys);});
+    std::thread t2([&]() {rc2 = txManager_->HandleRenameTx(dentrys);});
+
+    t1.join();
+    t2.join();
+    ASSERT_EQ(rc1, MetaStatusCode::OK);
+    ASSERT_EQ(rc2, MetaStatusCode::OK);
+}
+
 }  // namespace metaserver
 }  // namespace curvefs