]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ReplicatedPG::promote_object: check scrubber and block if necessary 4185/head
authorSamuel Just <sjust@redhat.com>
Fri, 20 Mar 2015 22:28:15 +0000 (15:28 -0700)
committerLoic Dachary <ldachary@redhat.com>
Wed, 25 Mar 2015 20:58:10 +0000 (21:58 +0100)
commit110c35498942ea0feec395b6e7992f802dd740ce
treefedbdc16a03c69c6a1dfbefe048811e8eb541fbc
parent899738e10e82b50dcf7dfffe5cc83937179bf323
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>
(cherry picked from commit 65bb4df599541cd2e0f195b905f24f529e255c00)
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h