From: Mykola Golub <mgolub@mirantis.com>
Date: Wed, 4 May 2016 12:25:04 +0000 (+0300)
Subject: rbd-mirror: avoid potential deadlock
X-Git-Tag: v11.0.0~570^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46bf727d43af4975beeb514630a99d59cfb0a406;p=ceph.git

rbd-mirror: avoid potential deadlock

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/tools/rbd_mirror/ImageSync.cc b/src/tools/rbd_mirror/ImageSync.cc
index f2f6784b84c..66588d961a0 100644
--- a/src/tools/rbd_mirror/ImageSync.cc
+++ b/src/tools/rbd_mirror/ImageSync.cc
@@ -166,8 +166,6 @@ void ImageSync<I>::send_copy_image() {
     return;
   }
 
-  update_progress("COPY_IMAGE");
-
   CephContext *cct = m_local_image_ctx->cct;
   ldout(cct, 20) << dendl;
 
@@ -179,6 +177,8 @@ void ImageSync<I>::send_copy_image() {
     ctx, m_progress_ctx);
   m_lock.Unlock();
 
+  update_progress("COPY_IMAGE");
+
   m_image_copy_request->send();
 }