]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon/MDSMonitor: return mon_mds_force_trim_to even if equal to current epoch
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 14 Jul 2021 20:31:21 +0000 (13:31 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 29 Jul 2021 15:50:15 +0000 (08:50 -0700)
commitb38745e56bcfcc64feb45fbc77f6823dbb3535ed
tree0f20e5f1955616bc894734cd96b1059b14cb6824
parentf1813f69049a00eb4218bb01bc9f86cbad310606
mon/MDSMonitor: return mon_mds_force_trim_to even if equal to current epoch

The PaxosService code already excludes the value returned by
PaxosService::get_trim_to as the upper bound of the range of epochs to
trim. Without this fix, you need to set mon_mds_force_trim_to to one
greater than the epoch you want to trim _and_ force the current epoch to
be one greater than that; the net result being that you can only force
trimming up to 2 epochs behind the current epoch.

This change is helpful for resolving issue 51673, but not strictly
necessary.

Related-to: https://tracker.ceph.com/issues/51673
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d9dc2f11d56fb4341ba5823f8d17459d10f3b2c1)

Conflicts:
src/common/options/mon.yaml.in: drop doc change
src/mon/MDSMonitor.cc