Merge pull request #45785 from ronen-fr/wip-rf-45640-pacific

pacific: osd/scrub: restart snap trimming only after scrubbing is done

Reviewed-by: Neha Ojha <nojha@redhat.com>

diff --cc src/osd/PrimaryLogPG.cc
Simple merge

diff --cc src/osd/pg_scrubber.cc
index f733f8ae8b2798712c14502c33af44c91714c463,bca92a5f46fffbe2c069c23b5281eace69e2a2b3..59372e552fc2875d5ad1e51651c92db9fa752c12
--- 1/src/osd/pg_scrubber.cc
--- 2/src/osd/pg_scrubber.cc
+++ b/src/osd/pg_scrubber.cc
@@@ -176,8 -176,12 +176,11 @@@ void PgScrubber::initiate_regular_scrub
    if (check_interval(epoch_queued)) {
      dout(10) << "scrubber event -->> StartScrub epoch: " << epoch_queued << dendl;
      reset_epoch(epoch_queued);
 -    m_fsm->my_states();
      m_fsm->process_event(StartScrub{});
      dout(10) << "scrubber event --<< StartScrub" << dendl;
+   } else {
+     // and just in case snap trimming was blocked by the aborted scrub
+     m_pg->snap_trimmer_scrub_complete();
    }
  }
  
@@@ -188,11 -192,13 +191,12 @@@ void PgScrubber::initiate_scrub_after_r
    if (check_interval(epoch_queued)) {
      dout(10) << "scrubber event -->> AfterRepairScrub epoch: " << epoch_queued << dendl;
      reset_epoch(epoch_queued);
 -    m_fsm->my_states();
      m_fsm->process_event(AfterRepairScrub{});
      dout(10) << "scrubber event --<< AfterRepairScrub" << dendl;
+   } else {
+     m_pg->snap_trimmer_scrub_complete();
    }
  }
- 
  void PgScrubber::send_scrub_unblock(epoch_t epoch_queued)
  {
    dout(10) << "scrubber event -->> " << __func__ << " epoch: " << epoch_queued << dendl;