Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
d4b1cc61e6526d325fd759f98e13e5a10523f5f7)
Conflicts:
src/osd/PeeringState.h
- not introducing this function since it is just a getter and it's not
clear where it should go in nautilus
src/osd/PrimaryLogPG.h
- use last_update_ondisk directly instead of via getter function
bool transaction_applied,
ObjectStore::Transaction &t,
bool async = false) override {
+ if (is_primary()) {
+ ceph_assert(trim_to <= last_update_ondisk);
+ }
if (hset_history) {
info.hit_set = *hset_history;
}