From: Alex Ainscow Date: Tue, 9 Dec 2025 11:13:28 +0000 (+0000) Subject: doc: Confirm DEPRECATED checklist item and clean up pg_scrubber X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2cf246642c524601d5e33bbbc9136ce41f3bb2e6;p=ceph.git doc: Confirm DEPRECATED checklist item and clean up pg_scrubber No DEPRECATED features. Remove some code labeled as "Remove in Umbrella" Signed-off-by: Alex Ainscow --- diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index 700d8b2a3efe..74f53d9c385f 100644 --- a/doc/dev/release-checklists.rst +++ b/doc/dev/release-checklists.rst @@ -58,7 +58,7 @@ Feature bits ------------ - [x] ensure that `SERVER_X` is defined -- [ ] change any features `DEPRECATED` in release X-3 are now marked `RETIRED`. +- [x] change any features `DEPRECATED` in release X-3 are now marked `RETIRED`. - [ ] look for features that (1) were present in X-2 and (2) have no client dependency and mark them `DEPRECATED` as of X. @@ -98,12 +98,12 @@ OSDMap Code cleanup ------------ -- [ ] search code for "after X-1" or "X" for conditional checks -- [ ] search code for X-2 and X-3 (`CEPH_FEATURE_SERVER_*` and +- [x] search code for "after X-1" or "X" for conditional checks +- [x] search code for X-2 and X-3 (`CEPH_FEATURE_SERVER_*` and `ceph_release_t::*`) - [ ] search code for `require_osd_release` - [ ] search code for `min_mon_release` -- [ ] check include/denc.h if DENC_START macro still needs reference to squid +- [x] check include/denc.h if DENC_START macro still needs reference to squid QA suite -------- diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc index d85a89011d2e..b5114a080057 100644 --- a/src/osd/scrubber/pg_scrubber.cc +++ b/src/osd/scrubber/pg_scrubber.cc @@ -1137,8 +1137,6 @@ bool PgScrubber::write_blocked_by_scrub(const hobject_t& soid) } get_osd_perf_counters()->inc(unlabeled_cntrs_idx.write_blocked); - // to be removed in version 'Umbrella': - get_labeled_counters()->inc(scrbcnt_write_blocked); return true; }