From: Matan Breizman <mbreizma@redhat.com>
Date: Mon, 14 Oct 2024 07:02:21 +0000 (+0300)
Subject: Merge pull request #59878 from xxhdx1985126/wip-68147
X-Git-Tag: v20.0.0~858
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e252561f547dfce329b7ca5f1f05a50d8362fb03;p=ceph.git

Merge pull request #59878 from xxhdx1985126/wip-68147

crimson/osd/backfill_state: push peer pg infos' last_backfills only when all objects before them are backfilled

Reviewed-by: Matan Breizman <mbreizma@redhat.com>
---

e252561f547dfce329b7ca5f1f05a50d8362fb03
diff --cc src/crimson/osd/backfill_state.cc
index a62d0df24111d,172c5e9cb0c1f..52b39833f233f
--- a/src/crimson/osd/backfill_state.cc
+++ b/src/crimson/osd/backfill_state.cc
@@@ -578,9 -580,10 +579,11 @@@ void BackfillState::ProgressTracker::co
      peering_state().update_complete_backfill_object_stats(
        soid,
        *item.stats);
+     assert(soid > new_last_backfill);
+     new_last_backfill = soid;
    }
 -  if (Enqueuing::all_enqueued(peering_state(),
 +  if (may_push_to_max &&
 +      Enqueuing::all_enqueued(peering_state(),
                                backfill_state().backfill_info,
                                backfill_state().peer_backfill_info) &&
        tracked_objects_completed()) {