librados: fix potential race condition if notify immediately fails

Fixes: http://tracker.ceph.com/issues/23966
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit cc06fbab08ef5b7f1b18f2af333c019ad86de03d)

diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
index 17bf91a1d3de8778b3af2212fe372cd8ddbb9da6..42c8a98f4b5b8f8f303be9ec4c12ad077ee7db69 100644 (file)
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@ -1521,6 +1521,7 @@ int librados::IoCtxImpl::notify(const object_t& oid, bufferlist& bl,
   } else {
     ldout(client->cct, 10) << __func__ << " failed to initiate notify, r = "
                           << r << dendl;
+    notify_finish_cond.wait();
   }
 
   objecter->linger_cancel(linger_op);