]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ReplicatedPG::promote_object: check scrubber and block if necessary 4162/head
authorSamuel Just <sjust@redhat.com>
Fri, 20 Mar 2015 22:28:15 +0000 (15:28 -0700)
committerSamuel Just <sjust@redhat.com>
Mon, 23 Mar 2015 21:40:59 +0000 (14:40 -0700)
commit65bb4df599541cd2e0f195b905f24f529e255c00
tree38230105c2ea6d83b7cbcc8a13ac150b4dc9728c
parentc60ba6af8cf45ce8fccf2df04ac01e76efdf4a96
ReplicatedPG::promote_object: check scrubber and block if necessary

Otherwise, we might attempt to promote into an in-progress scrub
interval causing 11156.  I would have added a return value to
promote_object(), but could not find an existing user which
cared to distinguish the cases, even with a null op passed.
All existing users are in maybe_handle_cache.  The ones which
pass a null op are for promoting the object in parallel
with a proxy -- a case where not actually performing the promote
does not really matter.

Fixes: #11156
Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h