From 569f06f1241309a710a0570d4ede950c1dc6e5d1 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Wed, 4 May 2016 15:25:04 +0300 Subject: [PATCH] rbd-mirror: avoid potential deadlock Signed-off-by: Mykola Golub (cherry picked from commit 46bf727d43af4975beeb514630a99d59cfb0a406) --- src/tools/rbd_mirror/ImageSync.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd_mirror/ImageSync.cc b/src/tools/rbd_mirror/ImageSync.cc index f71dfdd6e5705..2c6f5aa58f7eb 100644 --- a/src/tools/rbd_mirror/ImageSync.cc +++ b/src/tools/rbd_mirror/ImageSync.cc @@ -166,8 +166,6 @@ void ImageSync::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::send_copy_image() { ctx, m_progress_ctx); m_lock.Unlock(); + update_progress("COPY_IMAGE"); + m_image_copy_request->send(); } -- 2.39.5