Revert "fix metaserver deadlock caused by bthread coroutine switching"

This reverts commit d0cd3fc. Signed-off-by: Hanqing Wu <wuhanqing@corp.netease.com>
opencurve · Dec 12, 2023 · 8ffbe4b · 8ffbe4b
1 parent f233132
commit 8ffbe4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/curvefs/src/metaserver/partition.cpp b/curvefs/src/metaserver/partition.cpp
@@ -82,12 +82,7 @@ Partition::Partition(PartitionInfo partition,
     }
 
     if (partitionInfo_.status() != PartitionStatus::DELETING) {
-        auto handle = std::async(std::launch::async, [&]() {
-            TrashManager::GetInstance().Add(
-                partitionInfo_.partitionid(), trash);
-        });
-        handle.wait();
-
+        TrashManager::GetInstance().Add(partitionInfo_.partitionid(), trash);
         if (startCompact) {
             StartS3Compact();
         }

diff --git a/curvefs/test/metaserver/copyset/raft_cli_service2_test.cpp b/curvefs/test/metaserver/copyset/raft_cli_service2_test.cpp
@@ -472,7 +472,7 @@ TEST_F(RaftCliService2Test, ChangePeerTest) {
 
     // change peer succeed
     {
-        // sleep(60);
+        sleep(60);
         ChangePeersRequest2 request;
         ChangePeersResponse2 response;
         SetRequestPoolAndCopysetId(&request);