]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: populate the trim_thru epoch using MOSDMap.oldest_map
authorKefu Chai <kchai@redhat.com>
Wed, 16 Mar 2016 13:15:35 +0000 (21:15 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 20 May 2016 02:11:01 +0000 (10:11 +0800)
commitac0340ad30329df7919ce82938ad49d0a2e2d160
tree925c324ae93083a6bda7ae76fa50348efa44108b
parentb9b5f966ddfe7e706c038db204271ee662e0d825
osd: populate the trim_thru epoch using MOSDMap.oldest_map

instead of filling MOSDMap with the local oldest_map, we share
the maximum MOSDMap.oldest_map received so far with peers. That
way one OSD's failure to trim won't prevent it from sharing with
others that they are allowed to trim.

Fixes: #13990
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 9789c29fe0f82b236703f7ae4d356251fde3a46f)

Conflict: use atomic_t instead of std::atomic<>
src/osd/OSD.cc
src/osd/OSD.h