]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librados: fix potential race condition if notify immediately fails 21859/head
authorJason Dillaman <dillaman@redhat.com>
Mon, 7 May 2018 17:23:43 +0000 (10:23 -0700)
committerJason Dillaman <dillaman@redhat.com>
Tue, 8 May 2018 13:04:09 +0000 (06:04 -0700)
Fixes: http://tracker.ceph.com/issues/23966
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/librados/IoCtxImpl.cc

index 668eb2f7bd11033064ce1cf5cf969a37cab56bab..cc8d7a27ead31212819d8b3e852c4ec32b1fbc20 100644 (file)
@@ -1860,6 +1860,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);