]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
osd/PG: align past_intervals and last_epoch_clean for fabricated merge target
authorSage Weil <sage@redhat.com>
Tue, 19 Feb 2019 15:31:50 +0000 (09:31 -0600)
committerSage Weil <sage@redhat.com>
Tue, 19 Feb 2019 15:34:31 +0000 (09:34 -0600)
commitc6f9a4069bb32f0a4fae475c2b5f593f01b45c14
tree1f121859f08edc46554006d1780583f019748d86
parenta941e2807bf2c5ee5a0c8d7023d29ae58257e571
osd/PG: align past_intervals and last_epoch_clean for fabricated merge target

Fix fix from b79442efce479fde7f8bda8fdadf86e91003a327.  We need to
use last_epoch_clean *after* we set it when comparing it to the
past_intervals.

Fixes: http://tracker.ceph.com/issues/37511
Fixes: http://tracker.ceph.com/issues/24866
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PG.cc