librbd: ensure managed lock can shut down if stuck waiting for register

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit cb6712b0d9d5bccadb23a0e011eef05cf4d92280)
(cherry picked from commit f1c0bda32f0d15c0b0808ec1ef4ccfaee8d177b0)

diff --git a/src/librbd/ManagedLock.cc b/src/librbd/ManagedLock.cc
index 55199a604a8647b203ccb32d733e173950fe9b65..6900427ccf40314f1f69547d97c6ac4660948fc8 100644 (file)
--- a/src/librbd/ManagedLock.cc
+++ b/src/librbd/ManagedLock.cc
@@ -129,6 +129,16 @@ void ManagedLock<I>::shut_down(Context *on_shut_down) {
 
   Mutex::Locker locker(m_lock);
   assert(!is_state_shutdown());
+
+  if (m_state == STATE_WAITING_FOR_REGISTER) {
+    // abort stalled acquire lock state
+    ldout(m_cct, 10) << "woke up waiting acquire" << dendl;
+    Action active_action = get_active_action();
+    assert(active_action == ACTION_TRY_LOCK ||
+           active_action == ACTION_ACQUIRE_LOCK);
+    complete_active_action(STATE_UNLOCKED, -ESHUTDOWN);
+  }
+
   execute_action(ACTION_SHUT_DOWN, on_shut_down);
 }
 

diff --git a/src/test/librbd/test_mock_ManagedLock.cc b/src/test/librbd/test_mock_ManagedLock.cc
index 550b51fc61ec5e4fa9da36f2457fd8e79443d687..f93961afbd5d1f01d0980f7284b42c2ab82cd3ea 100644 (file)
--- a/src/test/librbd/test_mock_ManagedLock.cc
+++ b/src/test/librbd/test_mock_ManagedLock.cc
@@ -554,4 +554,25 @@ TEST_F(TestMockManagedLock, ReacquireWithSameCookie) {
   ASSERT_EQ(0, when_shut_down(managed_lock));
 }
 
+TEST_F(TestMockManagedLock, ShutDownWhileWaiting) {
+  librbd::ImageCtx *ictx;
+  ASSERT_EQ(0, open_image(m_image_name, &ictx));
+
+  MockManagedLockImageCtx mock_image_ctx(*ictx);
+  MockMockManagedLock managed_lock(ictx->md_ctx, ictx->op_work_queue,
+                               ictx->header_oid, mock_image_ctx.image_watcher,
+                               librbd::managed_lock::EXCLUSIVE, true, 0);
+
+  InSequence seq;
+
+  expect_get_watch_handle(*mock_image_ctx.image_watcher, 0);
+
+  C_SaferCond acquire_ctx;
+  managed_lock.acquire_lock(&acquire_ctx);
+
+  ASSERT_EQ(0, when_shut_down(managed_lock));
+  ASSERT_EQ(-ESHUTDOWN, acquire_ctx.wait());
+  ASSERT_FALSE(is_lock_owner(managed_lock));
+}
+
 } // namespace librbd