From 4aa53b647c667757658f09cab97ece6105997313 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Tue, 30 Oct 2018 10:36:58 +0200 Subject: [PATCH] osd: PG::_scan_snaps: apply_transaction -> queue_transaction Using apply_transaction when holding the pg lock is not safe. (partially cherry picked from commit 907b6281e99ece3677dd7b012cf4955731db6120) Signed-off-by: Mykola Golub --- src/osd/PG.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 4314b9b0b7fd0..12dd75d728149 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3915,9 +3915,9 @@ void PG::_scan_snaps(ScrubMap &smap) << "...repaired"; } snap_mapper.add_oid(hoid, oi_snaps, &_t); - r = osd->store->apply_transaction(osr.get(), std::move(t)); + r = osd->store->queue_transaction(osr.get(), std::move(t), nullptr); if (r != 0) { - derr << __func__ << ": apply_transaction got " << cpp_strerror(r) + derr << __func__ << ": queue_transaction got " << cpp_strerror(r) << dendl; } } -- 2.39.5