Merge pull request #30955 from runsisi/wip-fix-dup-lock

librbd: force reacquire lock if blacklist is disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2019-10-25 08:33:51 -04:00 committed by GitHub
commit b0c876b48a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View 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<