From fa27b6eb85297950a4ac51799479b5181f42b709 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Wed, 2 Dec 2020 16:48:15 +0800 Subject: [PATCH] crimson/osd: drop redundant locking operations in ObjectContext::wait_recovery_read() Signed-off-by: Xuehan Xu --- src/crimson/osd/object_context.h | 6 ++---- src/crimson/osd/replicated_recovery_backend.cc | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/crimson/osd/object_context.h b/src/crimson/osd/object_context.h index 7e14ac3e16f0c..16bae92a7950e 100644 --- a/src/crimson/osd/object_context.h +++ b/src/crimson/osd/object_context.h @@ -163,10 +163,8 @@ public: return false; } } - seastar::future<> wait_recovery_read() { - return lock.lock_for_read().then([this] { - recovery_read_marker = true; - }); + void wait_recovery_read() { + recovery_read_marker = true; } void drop_recovery_read() { assert(recovery_read_marker); diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc index 42fc442ec435b..274b06cfecfad 100644 --- a/src/crimson/osd/replicated_recovery_backend.cc +++ b/src/crimson/osd/replicated_recovery_backend.cc @@ -126,7 +126,8 @@ auto ReplicatedRecoveryBackend::load_obc_for_recovery( return pg.with_head_obc(soid, [&recovery_waiter](auto obc) { logger().debug("load_obc_for_recovery: loaded obc: {}", obc->obs.oi.soid); recovery_waiter.obc = obc; - return recovery_waiter.obc->wait_recovery_read(); + recovery_waiter.obc->wait_recovery_read(); + return seastar::now(); }); } -- 2.39.5