From 201b51d7200756572224d72f88033b98739b5a63 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Mon, 25 Nov 2024 18:59:12 +0000 Subject: [PATCH] osd: drop dead code that depends on OmapIterator::status() For `BlueStore`, `MemStore` and `KStore` the `status()` unconditionally returns `0`. Signed-off-by: Radoslaw Zarzynski --- src/osd/ReplicatedBackend.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index a2129f237e36..9ee549eb1658 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -813,7 +813,7 @@ int ReplicatedBackend::be_deep_scrub( iter->seek_to_first(); } int max = g_conf()->osd_deep_scrub_keys; - while (iter->status() == 0 && iter->valid()) { + while (iter->valid()) { pos.omap_bytes += iter->value().length(); ++pos.omap_keys; --max; @@ -829,12 +829,6 @@ int ReplicatedBackend::be_deep_scrub( pos.omap_pos = iter->key(); return -EINPROGRESS; } - if (iter->status() < 0) { - dout(25) << __func__ << " " << poid - << " on omap scan, db status error" << dendl; - o.read_error = true; - return 0; - } } if (pos.omap_keys > cct->_conf-> -- 2.47.3