curvefs/metaserver: skip find dentry when loading from snapshot

opencurve · May 25, 2022 · f79f1d7 · f79f1d7
1 parent 9922978
commit f79f1d7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/curvefs/src/metaserver/dentry_manager.cpp b/curvefs/src/metaserver/dentry_manager.cpp
@@ -56,15 +56,16 @@ void DentryManager::Log4Code(const std::string& request, MetaStatusCode rc) {
     }
 }
 
-MetaStatusCode DentryManager::CreateDentry(const Dentry& dentry) {
+MetaStatusCode DentryManager::CreateDentry(const Dentry& dentry,
+                                           bool isLoadding) {
     Log4Dentry("CreateDentry", dentry);
     MetaStatusCode rc;
     // invoke only from snapshot loading
     if (dentry.flag() & DentryFlag::TRANSACTION_PREPARE_FLAG) {
         rc = dentryStorage_->HandleTx(DentryStorage::TX_OP_TYPE::PREPARE,
                                       dentry);
     } else {
-        rc = dentryStorage_->Insert(dentry);
+        rc = dentryStorage_->Insert(dentry, isLoadding);
     }
     Log4Code("CreateDentry", rc);
     return rc;

diff --git a/curvefs/src/metaserver/dentry_manager.h b/curvefs/src/metaserver/dentry_manager.h
@@ -40,7 +40,7 @@ class DentryManager {
     DentryManager(std::shared_ptr<DentryStorage> dentryStorage,
                   std::shared_ptr<TxManager> txManger);
 
-    MetaStatusCode CreateDentry(const Dentry& dentry);
+    MetaStatusCode CreateDentry(const Dentry& dentry, bool isLoadding = false);
 
     MetaStatusCode DeleteDentry(const Dentry& dentry);
 

diff --git a/curvefs/src/metaserver/dentry_storage.cpp b/curvefs/src/metaserver/dentry_storage.cpp
@@ -152,18 +152,20 @@ MetaStatusCode DentryStorage::Find(const Dentry& in,
     return rc;
 }
 
-MetaStatusCode DentryStorage::Insert(const Dentry& dentry) {
+MetaStatusCode DentryStorage::Insert(const Dentry& dentry, bool isLoadding) {
     WriteLockGuard w(rwLock_);
 
-    Dentry out;
-    MetaStatusCode rc = Find(dentry, &out, true);
-    if (rc == MetaStatusCode::OK) {
-        if (IsSameDentry(out, dentry)) {
-            return MetaStatusCode::IDEMPOTENCE_OK;
+    if (!isLoadding) {
+        Dentry out;
+        MetaStatusCode rc = Find(dentry, &out, true);
+        if (rc == MetaStatusCode::OK) {
+            if (IsSameDentry(out, dentry)) {
+                return MetaStatusCode::IDEMPOTENCE_OK;
+            }
+            return MetaStatusCode::DENTRY_EXIST;
+        } else if (rc != MetaStatusCode::NOT_FOUND) {
+            return MetaStatusCode::STORAGE_INTERNAL_ERROR;
         }
-        return MetaStatusCode::DENTRY_EXIST;
-    } else if (rc != MetaStatusCode::NOT_FOUND) {
-        return MetaStatusCode::STORAGE_INTERNAL_ERROR;
     }
 
     // MetaStatusCode::NOT_FOUND

diff --git a/curvefs/src/metaserver/dentry_storage.h b/curvefs/src/metaserver/dentry_storage.h
@@ -65,7 +65,7 @@ class DentryStorage {
     DentryStorage(std::shared_ptr<KVStorage> kvStorage,
                   const std::string& tablename);
 
-    MetaStatusCode Insert(const Dentry& dentry);
+    MetaStatusCode Insert(const Dentry& dentry, bool isLoadding = false);
 
     MetaStatusCode Delete(const Dentry& dentry);
 

diff --git a/curvefs/src/metaserver/partition.cpp b/curvefs/src/metaserver/partition.cpp
@@ -69,7 +69,7 @@ MetaStatusCode Partition::CreateDentry(const Dentry& dentry, bool isLoadding) {
     if (GetStatus() == PartitionStatus::DELETING) {
         return MetaStatusCode::PARTITION_DELETING;
     }
-    MetaStatusCode ret = dentryManager_->CreateDentry(dentry);
+    MetaStatusCode ret = dentryManager_->CreateDentry(dentry, isLoadding);
     if (MetaStatusCode::OK == ret) {
         if (!isLoadding) {
             return inodeManager_->UpdateInodeWhenCreateOrRemoveSubNode(