fix metaserver deadlock caused by bthread coroutine switching

Signed-off-by: wanghai01 <seanhaizi@163.com>
wu-hanqing · Dec 11, 2023 · d0cd3fc · d0cd3fc
1 parent c8de94b
commit d0cd3fc
Show file tree

Hide file tree

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