]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/scrub: remove reliance of Scrubber objects' logging on the PG 45729/head
authorRonen Friedman <rfriedma@redhat.com>
Sun, 25 Jul 2021 11:58:51 +0000 (14:58 +0300)
committerRonen Friedman <rfriedma@redhat.com>
Thu, 31 Mar 2022 10:47:58 +0000 (10:47 +0000)
commit8b24ce1b043f469d1f47b0355b5f76d716f9438b
treed720e7c1dc497812cdde839be72c5ff56b9eb009
parentf5e8c20edf1fd6ce9fe4d0f2c8790aa6d1433460
osd/scrub: remove reliance of Scrubber objects' logging on the PG

Modify the Scrubber's sub-objects to use their own gen_prefix()
functions, instead of using PG::gen_prefix().

Fixes: https://tracker.ceph.com/issues/51843
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 2aeb9263d643b19d59219e8e187e1a0fa0292693)

Conflicts:
        src/osd/PG.h
        src/osd/PrimaryLogScrub.cc
        src/osd/pg_scrubber.cc
        src/osd/pg_scrubber.h

Conflict resolution:
- manually removing some scrub scheduling changes from
  PR #40984
- pg_scrubber.h: removing some irrelevant lines that were dragged
  in.
- PG.h: restoring lines removed by the merge.
src/osd/PG.h
src/osd/PrimaryLogScrub.cc
src/osd/pg_scrubber.cc
src/osd/pg_scrubber.h
src/osd/scrub_machine.cc
src/osd/scrub_machine.h
src/osd/scrub_machine_lstnr.h