Skip to content

Commit

Permalink
client: request next osdmap for blacklisted client
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhi Zhang committed Nov 1, 2018
1 parent 1b57df1 commit 1baf91e
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/client/Client.cc
Expand Up @@ -2512,6 +2512,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 {
Expand Down

0 comments on commit 1baf91e

Please sign in to comment.