]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
osd/scrub: improve scrub target dumps
authorRonen Friedman <rfriedma@redhat.com>
Sat, 27 Dec 2025 17:18:46 +0000 (17:18 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Mon, 5 Jan 2026 13:23:27 +0000 (15:23 +0200)
commit7bb4322c2cf55dccccbccff722a1bf845ce5b441
tree8c7faa81b036dfc27c43ed8744bb9d8a367d98bc
parente42773a3e6b76db8f78881aa8bbeaa85fb616648
osd/scrub: improve scrub target dumps

Following the changes to the internal structures used for
scrub scheduling, improve the code handling external queries
and dumps, so that:
- common code is used when creating the JSON lines for scrub targets;
- the data dumped more closely matches the internal state;

Specifically:
- the scrub-queue dump ('tell osd.1 dump_scrubs') now includes
  whether the target is active (being scrubbed) or not.
- the scrubber dump (the ',scrubber' object in 'pg <pgid> query'
  output) now also dumps the two scrub targets.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
src/osd/scrubber/osd_scrub.cc
src/osd/scrubber/osd_scrub_sched.cc
src/osd/scrubber/osd_scrub_sched.h
src/osd/scrubber/pg_scrubber.cc
src/osd/scrubber/scrub_job.cc
src/osd/scrubber/scrub_job.h
src/osd/scrubber/scrub_queue_entry.h