]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
client: fix blacklist removal failed 33169/head
authorjrshiqi <root@YZ-25-60-7.h.chinabank.com.cn>
Thu, 16 Jan 2020 09:02:38 +0000 (17:02 +0800)
committergengjichao <chaofuwa2008@126.com>
Mon, 10 Feb 2020 07:27:36 +0000 (15:27 +0800)
commitf1fa4e891f62e0796d09a1c9d8919785c9f420c6
tree8d26280a398957a03342448af993a24528d2752e
parentb2631ba462c22adcb479a1df17c16eb4f125c173
client: fix blacklist removal failed

when network is up until over mon_osd_blacklist_default_expire,
the ceph-fuse will receive two epoch OSDMap,one include blacklist,
the other one is blacklist recovery,but blacklist_events include recovered blacklist,
then the client is added to the blacklist in error.
the solution is that used the  objecter->with_osdmap to determine whether there is a blacklist,
the objecter->with_osdmap has the correct blacklist.

Fixes:https://tracker.ceph.com/issues/37617
Signed-off-by: gengjichao <chaofuwa2008@126.com>
src/client/Client.cc