Merge pull request #9025 from trociny/fixup-rbd-mirror-status

rbd-mirror: avoid potential deadlock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-05-11 17:00:39 -04:00
commit 221ea5e2fe

View File

@ -166,8 +166,6 @@ void ImageSync<I>::send_copy_image() {
return; return;
} }
update_progress("COPY_IMAGE");
CephContext *cct = m_local_image_ctx->cct; CephContext *cct = m_local_image_ctx->cct;
ldout(cct, 20) << dendl; ldout(cct, 20) << dendl;
@ -179,6 +177,8 @@ void ImageSync<I>::send_copy_image() {
ctx, m_progress_ctx); ctx, m_progress_ctx);
m_lock.Unlock(); m_lock.Unlock();
update_progress("COPY_IMAGE");
m_image_copy_request->send(); m_image_copy_request->send();
} }