From 3c49ff220d5ad56b88e1e25c4e79a409236f3717 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 19 May 2020 11:33:38 +0200 Subject: [PATCH] crimson/osd: recovery locking uses ceph_assert_always(). Signed-off-by: Radoslaw Zarzynski --- src/crimson/osd/pg_recovery.cc | 2 +- src/crimson/osd/replicated_recovery_backend.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc index 7320fed5a26a4..4a9ec12a37bfe 100644 --- a/src/crimson/osd/pg_recovery.cc +++ b/src/crimson/osd/pg_recovery.cc @@ -344,7 +344,7 @@ void PGRecovery::on_local_recover( obc->obs.oi = recovery_info.oi; // obc is loaded the excl lock obc->put_lock_type(RWState::RWEXCL); - assert(obc->get_recovery_read().get0()); + ceph_assert_always(obc->get_recovery_read().get0()); } if (!pg->is_unreadable_object(soid)) { pg->get_recovery_backend()->get_recovering(soid).set_readable(); diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc index 6861171d68cda..72619387aa6e3 100644 --- a/src/crimson/osd/replicated_recovery_backend.cc +++ b/src/crimson/osd/replicated_recovery_backend.cc @@ -65,7 +65,7 @@ seastar::future<> ReplicatedRecoveryBackend::recover_object( recovery_waiter.obc->put_lock_type(RWState::RWEXCL); } bool got = recovery_waiter.obc->get_recovery_read().get0(); - assert(pulled ? got : 1); + ceph_assert_always(pulled ? got : 1); if (!got) { return recovery_waiter.obc->get_recovery_read(true) .then([](bool) { return seastar::now(); }); @@ -80,7 +80,7 @@ seastar::future<> ReplicatedRecoveryBackend::recover_object( recovery_waiter.obc = obc; // obc is loaded with excl lock recovery_waiter.obc->put_lock_type(RWState::RWEXCL); - assert(recovery_waiter.obc->get_recovery_read().get0()); + ceph_assert_always(recovery_waiter.obc->get_recovery_read().get0()); return seastar::make_ready_future<>(); }) ); -- 2.39.5