From: Samuel Just Date: Wed, 10 Sep 2014 19:02:56 +0000 (-0700) Subject: Merge pull request #2293 from ceph/wip-hitset-bytes X-Git-Tag: v0.86~99 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0feeaa150c476e038d591e8a5dfd6eb8fa58517;p=ceph.git 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 --- d0feeaa150c476e038d591e8a5dfd6eb8fa58517 diff --cc src/osd/ReplicatedPG.cc index 7578b6e4091bb,963a713350740..84c15138d2fd4 --- a/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, "