client: request next osdmap for blacklisted client

When client became blacklisted, it did't subscribe next osdmap. So when
it was removed from blacklist by expiration or commandline, it didn't
get updated osdmap which is the only way for the client to reset its
blacklisted flag.

Fixes: http://tracker.ceph.com/issues/36668
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit 1baf91e7ef0419270d6ea5d7d68adb94a2403114)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index fc99ad53bef945acddac43cc971a78a4e17319bf..03ecb97054c95c7752da95c37778456ec0fef1f9 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -2475,6 +2475,12 @@ void Client::handle_osd_map(MOSDMap *m)
         return o.is_blacklisted(myaddr);});
   }
 
+  // Always subscribe to next osdmap for blacklisted client
+  // until this client is not blacklisted.
+  if (blacklisted) {
+    objecter->maybe_request_map();
+  }
+
   if (objecter->osdmap_full_flag()) {
     _handle_full_flag(-1);
   } else {