fix trash bug: When deleting partition, delete all trace node

Signed-off-by: UniverseParticle <[email protected]>

curvefs/src/metaserver/inode_storage.cpp

@@ -255,6 +255,17 @@ void InodeStorage::LoadDeletedInodes(std::map<std::string, uint64_t> * inodes) {
     VLOG(6) << "load deleted over";
 }
 
+MetaStatusCode InodeStorage::RemoveAllDeletedInode() {
+    VLOG(6) << "remove all deleted key start with: " << table4DelInode_;
+    auto s = kvStorage_->HClear(table4DelInode_);
+    if (s.ok()) {
+       VLOG(6) << "remove all deleted key over";
+       return MetaStatusCode::OK;
+    }
+    LOG(ERROR) << "remove all deleted key failed, status = " << s.ToString();
+    return MetaStatusCode::STORAGE_INTERNAL_ERROR;
+}
+
 MetaStatusCode InodeStorage::Get(const Key4Inode& key, Inode* inode) {
     ReadLockGuard lg(rwLock_);
     std::string skey = conv_.SerializeToString(key);

curvefs/src/metaserver/inode_storage.h

@@ -87,6 +87,8 @@ class InodeStorage {
 
     MetaStatusCode RemoveDeletedInode(const Key4Inode& key);
 
+    MetaStatusCode RemoveAllDeletedInode();
+
     void LoadDeletedInodes(std::map<std::string, uint64_t> * inodes);
 
     /**

curvefs/src/metaserver/trash.cpp

@@ -152,6 +152,10 @@ void TrashImpl::RemoveDeletedInode(uint64_t inodeId) {
     }
 }
 
+void TrashImpl::RemoveDeleteNode() {
+    inodeStorage_->RemoveAllDeletedInode();
+}
+
 bool TrashImpl::NeedDelete(uint64_t dtime) {
     // for compatibility, if fs recycleTimeHour is 0, use old trash logic
     // if fs recycleTimeHour is 0, use trash wait until expiredAfterSec

curvefs/src/metaserver/trash.h

@@ -86,6 +86,8 @@ class Trash {
     virtual void StopScan() = 0;
 
     virtual bool IsStop() = 0;
+
+    virtual void RemoveDeleteNode() = 0;
 };
 
 class TrashImpl : public Trash {
@@ -117,6 +119,8 @@ class TrashImpl : public Trash {
         copysetNode_ = node;
     }
 
+    void RemoveDeleteNode() override;
+
  private:
     bool NeedDelete(uint64_t dtime);
 

curvefs/src/metaserver/trash_manager.cpp

@@ -82,6 +82,7 @@ void TrashManager::Remove(uint32_t partitionId) {
         LOG(INFO) << "Remove partition from trash manager, partitionId = "
                   << partitionId;
         it->second->StopScan();
+        it->second->RemoveDeleteNode();
         trashs_.erase(it);
     } else {
         LOG(INFO) << "Remove partition from trash manager, "