From ee01a27101d00ab7db0466e1d000f194b18caad0 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Fri, 22 Feb 2019 19:25:44 -0500 Subject: [PATCH] rbd-mirror: image replay should retry asok registration upon failure If the asok registration fails (perhaps due to a race condition with a deleted and recreated image of the same name), periodically attempt to register the missing asok hook. Signed-off-by: Jason Dillaman (cherry picked from commit 2d2d3bbc791e807bb0c83072aaeee023116884ce) Conflicts: src/tools/rbd_mirror/ImageReplayer.cc: trivial resolution --- src/tools/rbd_mirror/ImageReplayer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 77331d8c332a..75596e4f158b 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -1829,7 +1829,7 @@ void ImageReplayer::reregister_admin_socket_hook() { { Mutex::Locker locker(m_lock); auto name = m_local_ioctx.get_pool_name() + "/" + m_local_image_name; - if (m_name == name) { + if (m_asok_hook != nullptr && m_name == name) { return; } m_name = name; -- 2.47.3