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 <aainscow@uk.ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 700d8b2a3efed34695d5a0086b9b305272324e4d..74f53d9c385f3fafb17810a0d70549269e66c5a3 100644 (file)
--- 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 d85a89011d2eaf180d77fcc72ae6487503994fa7..b5114a0800577058bda0c42615c60c6c469b23fa 100644 (file)
--- 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;
 }