From: luo.runbing <luo.runbing@zte.com.cn>
Date: Wed, 16 Oct 2019 06:53:37 +0000 (+0800)
Subject: librbd: force reacquire lock if blacklist is disabled
X-Git-Tag: v15.1.0~1164^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2fdabf328760a83aeb3f30c360b6cef1803e51d;p=ceph.git

librbd: force reacquire lock if blacklist is disabled

Signed-off-by: luo.runbing <luo.runbing@zte.com.cn>
---

diff --git a/src/librbd/ManagedLock.cc b/src/librbd/ManagedLock.cc
index ba97180b0b0..1d3aa2d0581 100644
--- a/src/librbd/ManagedLock.cc
+++ b/src/librbd/ManagedLock.cc
@@ -593,7 +593,7 @@ void ManagedLock<I>::send_reacquire_lock() {
   }
 
   m_new_cookie = encode_lock_cookie(watch_handle);
-  if (m_cookie == m_new_cookie) {
+  if (m_cookie == m_new_cookie && m_blacklist_on_break_lock) {
     ldout(m_cct, 10) << "skipping reacquire since cookie still valid"
                      << dendl;
     auto ctx = create_context_callback<