Merge PR ceph#24870 into master

* refs/pull/24870/head: client: request next osdmap for blacklisted client Reviewed-by: Patrick Donnelly <[email protected]>
yuvalif · Nov 2, 2018 · a71a984 · a71a984
2 parents cf9a0a2 + 1baf91e
commit a71a984
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -2513,6 +2513,12 @@ void Client::handle_osd_map(MOSDMap *m)
         return o.is_blacklisted(myaddrs);});
   }
 
+  // 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 {