]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: drop dead code that depends on OmapIterator::status()
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 25 Nov 2024 18:59:12 +0000 (18:59 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Fri, 4 Apr 2025 08:45:52 +0000 (08:45 +0000)
For `BlueStore`, `MemStore` and `KStore` the `status()`
unconditionally returns `0`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/osd/ReplicatedBackend.cc

index a2129f237e3685f87ef23505cf42bafe4732adf9..9ee549eb1658915e2d3336b14926d4da9ba5aa51 100644 (file)
@@ -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->