]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Fix hang on unfound object after mark_unfound_lost is done
authorDavid Zafman <dzafman@redhat.com>
Fri, 27 May 2016 05:09:42 +0000 (22:09 -0700)
committerDavid Zafman <dzafman@redhat.com>
Thu, 9 Feb 2017 17:16:07 +0000 (09:16 -0800)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 73a27533beba3587f8447b4d41d200427c45042b)

Conflicts:
src/osd/ReplicatedPG.cc (trivial)

src/osd/ReplicatedPG.cc

index ef69bf8917b2b4079c9a4049ad0ab69429fb4e9e..8b977ed23695829f3831ac8def8cde341c2a4258 100644 (file)
@@ -9863,6 +9863,7 @@ void ReplicatedPG::mark_all_unfound_lost(
       [=]() {
        requeue_ops(waiting_for_all_missing);
        waiting_for_all_missing.clear();
+       requeue_object_waiters(waiting_for_unreadable_object);
        osd->queue_for_recovery(this);
 
        stringstream ss;