From: Xuehan Xu <xuxuehan@qianxin.com>
Date: Wed, 10 Jul 2024 06:54:31 +0000 (+0800)
Subject: crimson/osd/pg_recovery: push the iteration forward after finding
X-Git-Tag: v19.2.1~303^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c986a9b612596a8d9498919ffb86bba3a89d020a;p=ceph.git

crimson/osd/pg_recovery: push the iteration forward after finding
unfound objects when starting primary recoveries

Fixes: https://tracker.ceph.com/issues/66885
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit acb66c1665937923ebb4b45b3e58364b26a51621)
---

diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc
index 4ed861cfd7ef..df3c6216825e 100644
--- a/src/crimson/osd/pg_recovery.cc
+++ b/src/crimson/osd/pg_recovery.cc
@@ -152,11 +152,13 @@ size_t PGRecovery::start_primary_recovery_ops(
     if (pg->get_peering_state().get_missing_loc().is_unfound(soid)) {
       logger().debug("{}: object {} unfound", __func__, soid);
       ++skipped;
+      ++p;
       continue;
     }
     if (pg->get_peering_state().get_missing_loc().is_unfound(head)) {
       logger().debug("{}: head object {} unfound", __func__, soid);
       ++skipped;
+      ++p;
       continue;
     }