OSD/ReplicatedPG: Fixing lack of object unblock when flush fails.

See: http://tracker.ceph.com/issues/14511

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 9205118f469089acd2a981d6b0943f0af4e0b998..a626b2cb7741ff5c8b2abda2f612bd97c9be0974 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -7870,6 +7870,11 @@ void ReplicatedPG::finish_flush(hobject_t oid, ceph_tid_t tid, int r)
   if (r < 0 && !(r == -ENOENT && fop->removal)) {
     if (fop->op)
       osd->reply_op_error(fop->op, -EBUSY);
+    if (fop->blocking) {
+      obc->stop_block();
+      kick_object_context_blocked(obc);
+    }
+
     if (!fop->dup_ops.empty()) {
       dout(20) << __func__ << " requeueing dups" << dendl;
       requeue_ops(fop->dup_ops);