update sources to 12.2.7

[ceph.git] / ceph / src / tools / rbd_mirror / ImageSync.cc

diff --git a/ceph/src/tools/rbd_mirror/ImageSync.cc b/ceph/src/tools/rbd_mirror/ImageSync.cc
index 94df5a8aac62247b17f53c5cc674a73fc57d02ab..7361cfbb4c06ecff85269a69ed678504f9802491 100644 (file)
--- a/ceph/src/tools/rbd_mirror/ImageSync.cc
+++ b/ceph/src/tools/rbd_mirror/ImageSync.cc
@@ -27,6 +27,7 @@ namespace rbd {
 namespace mirror {
 
 using namespace image_sync;
+using librbd::util::create_async_context_callback;
 using librbd::util::create_context_callback;
 using librbd::util::unique_lock_name;
 
@@ -85,15 +86,30 @@ void ImageSync<I>::send_notify_sync_request() {
 
   dout(20) << dendl;
 
-  Context *ctx = create_context_callback<
-    ImageSync<I>, &ImageSync<I>::handle_notify_sync_request>(this);
+  m_lock.Lock();
+  if (m_canceled) {
+    m_lock.Unlock();
+    BaseRequest::finish(-ECANCELED);
+    return;
+  }
+
+  Context *ctx = create_async_context_callback(
+    m_work_queue, create_context_callback<
+      ImageSync<I>, &ImageSync<I>::handle_notify_sync_request>(this));
   m_instance_watcher->notify_sync_request(m_local_image_ctx->id, ctx);
+  m_lock.Unlock();
 }
 
 template <typename I>
 void ImageSync<I>::handle_notify_sync_request(int r) {
   dout(20) << ": r=" << r << dendl;
 
+  m_lock.Lock();
+  if (r == 0 && m_canceled) {
+    r = -ECANCELED;
+  }
+  m_lock.Unlock();
+
   if (r < 0) {
     BaseRequest::finish(r);
     return;