From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 21 Feb 2019 17:37:00 +0000 (-0500)
Subject: rbd-mirror: avoid attempting to reacquire lock if blacklisted
X-Git-Tag: v14.1.1~114^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff37c5c348ee811675007fc90c6b09f094ebf372;p=ceph.git

rbd-mirror: avoid attempting to reacquire lock if blacklisted

The pool replayer state machine will automatically be restarted
when a blacklist is detected.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/tools/rbd_mirror/LeaderWatcher.cc b/src/tools/rbd_mirror/LeaderWatcher.cc
index 6606344dc87d..d1386ba746fc 100644
--- a/src/tools/rbd_mirror/LeaderWatcher.cc
+++ b/src/tools/rbd_mirror/LeaderWatcher.cc
@@ -1090,7 +1090,9 @@ template <typename I>
 void LeaderWatcher<I>::handle_rewatch_complete(int r) {
   dout(5) << "r=" << r << dendl;
 
-  m_leader_lock->reacquire_lock(nullptr);
+  if (r != -EBLACKLISTED) {
+    m_leader_lock->reacquire_lock(nullptr);
+  }
 }
 
 template <typename I>