]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: force reacquire lock if blacklist is disabled 30955/head
authorluo.runbing <luo.runbing@zte.com.cn>
Wed, 16 Oct 2019 06:53:37 +0000 (14:53 +0800)
committerluo.runbing <luo.runbing@zte.com.cn>
Wed, 16 Oct 2019 08:04:32 +0000 (16:04 +0800)
Signed-off-by: luo.runbing <luo.runbing@zte.com.cn>
src/librbd/ManagedLock.cc

index ba97180b0b0c0270c216c4f4f27d2f7c35ab06d1..1d3aa2d0581ba0e06228fb517da188d1f6b409ba 100644 (file)
@@ -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<