]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ReplicatedPG: merge apply_ctx_scrub_stats into apply_stats
authorSamuel Just <sjust@redhat.com>
Tue, 29 Nov 2016 21:56:06 +0000 (13:56 -0800)
committerSamuel Just <sjust@redhat.com>
Fri, 2 Dec 2016 21:40:14 +0000 (13:40 -0800)
commit0597309ddba3f20bf51b988d4e24f217701f151a
tree32a591e3ee149209be0965e4e14920d77391e455
parentd126abf8fd28bc106429e43218a4edab43a824fc
ReplicatedPG: merge apply_ctx_scrub_stats into apply_stats

The only way the two aren't called essentially atomically is when the
ECBackend needs to delay a write for rmw.  In such a case, we actually
want to delay the scrub_cstat application as well since otherwise, we'd
have to flush the backend before settling up at the end of scrub.

Perhaps this should be a separate function to distinguish between the
replica+primary info update and the primary scrub_cstat update, but that
seems more complicated than it's really worth.

Fixes: http://tracker.ceph.com/issues/17999
Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h