Skip to content

Commit 8ffbe4b

Browse files
committed
Revert "fix metaserver deadlock caused by bthread coroutine switching"
This reverts commit d0cd3fc. Signed-off-by: Hanqing Wu <wuhanqing@corp.netease.com>
1 parent f233132 commit 8ffbe4b

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

curvefs/src/metaserver/partition.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,7 @@ Partition::Partition(PartitionInfo partition,
8282
}
8383

8484
if (partitionInfo_.status() != PartitionStatus::DELETING) {
85-
auto handle = std::async(std::launch::async, [&]() {
86-
TrashManager::GetInstance().Add(
87-
partitionInfo_.partitionid(), trash);
88-
});
89-
handle.wait();
90-
85+
TrashManager::GetInstance().Add(partitionInfo_.partitionid(), trash);
9186
if (startCompact) {
9287
StartS3Compact();
9388
}

curvefs/test/metaserver/copyset/raft_cli_service2_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ TEST_F(RaftCliService2Test, ChangePeerTest) {
472472

473473
// change peer succeed
474474
{
475-
// sleep(60);
475+
sleep(60);
476476
ChangePeersRequest2 request;
477477
ChangePeersResponse2 response;
478478
SetRequestPoolAndCopysetId(&request);

0 commit comments

Comments
 (0)