Merge pull request #10051 from dachary/wip-16460-jewel

jewel: Crash when utilizing advisory locking API functions Reviewed-by: Mykola Golub <mgolub@mirantis.com>
ceph · Aug 9, 2016 · 543dd04 · 543dd04
2 parents 8fb4121 + 51defea
commit 543dd04
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
@@ -1019,10 +1019,7 @@ struct C_InvalidateCache : public Context {
 
   void ImageCtx::notify_update() {
     state->handle_update_notification();
-
-    C_SaferCond ctx;
-    image_watcher->notify_header_update(&ctx);
-    ctx.wait();
+    ImageWatcher::notify_header_update(md_ctx, header_oid);
   }
 
   void ImageCtx::notify_update(Context *on_finish) {

diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc
@@ -321,6 +321,14 @@ void ImageWatcher::notify_header_update(Context *on_finish) {
   m_notifier.notify(bl, nullptr, on_finish);
 }
 
+void ImageWatcher::notify_header_update(librados::IoCtx &io_ctx,
+				        const std::string &oid) {
+  // supports legacy (empty buffer) clients
+  bufferlist bl;
+  ::encode(NotifyMessage(HeaderUpdatePayload()), bl);
+  io_ctx.notify2(oid, bl, image_watcher::Notifier::NOTIFY_TIMEOUT, nullptr);
+}
+
 void ImageWatcher::schedule_cancel_async_requests() {
   FunctionContext *ctx = new FunctionContext(
     boost::bind(&ImageWatcher::cancel_async_requests, this));

diff --git a/src/librbd/ImageWatcher.h b/src/librbd/ImageWatcher.h
@@ -54,6 +54,8 @@ class ImageWatcher {
   void notify_request_lock();
 
   void notify_header_update(Context *on_finish);
+  static void notify_header_update(librados::IoCtx &io_ctx,
+                                   const std::string &oid);
 
   uint64_t get_watch_handle() const {
     RWLock::RLocker watch_locker(m_watch_lock);