Merge pull request #2293 from ceph/wip-hitset-bytes

osd: improve agent calculation by factoring out hit_set bytes used properly

Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --cc src/osd/ReplicatedPG.cc
index 7578b6e4091bb0b2b99fc29eb2987151f5a4e5cb,963a71335074063fcf690af63e5533a21abb4645..84c15138d2fd4950332aa1e057bf51bbcb14ce73
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -12146,9 -12040,11 +12153,11 @@@ void ReplicatedPG::_scrub_finish(
         !info.stats.omap_stats_invalid) ||
        (scrub_cstat.sum.num_objects_hit_set_archive != info.stats.stats.sum.num_objects_hit_set_archive &&
         !info.stats.hitset_stats_invalid) ||
+       (scrub_cstat.sum.num_bytes_hit_set_archive != info.stats.stats.sum.num_bytes_hit_set_archive &&
+        !info.stats.hitset_bytes_stats_invalid) ||
        scrub_cstat.sum.num_whiteouts != info.stats.stats.sum.num_whiteouts ||
        scrub_cstat.sum.num_bytes != info.stats.stats.sum.num_bytes) {
 -    osd->clog.error() << info.pgid << " " << mode
 +    osd->clog->error() << info.pgid << " " << mode
                      << " stat mismatch, got "
                      << scrub_cstat.sum.num_objects << "/" << info.stats.stats.sum.num_objects << " objects, "
                      << scrub_cstat.sum.num_object_clones << "/" << info.stats.stats.sum.num_object_clones << " clones, "

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

diff --cc src/osd/osd_types.h
Simple merge