import quincy beta 17.1.0

[ceph.git] / ceph / src / osd / PGLog.h

diff --git a/ceph/src/osd/PGLog.h b/ceph/src/osd/PGLog.h
index 920b40dabc1a225df354e5168449602b9e5b6fd1..25c88217c51cce1ddd35c7da9e58eeea2495b396 100644 (file)
--- a/ceph/src/osd/PGLog.h
+++ b/ceph/src/osd/PGLog.h
@@ -1490,6 +1490,11 @@ public:
        }
       }
     }
+    if (info.pgid.is_no_shard()) {
+      // replicated pool pg does not persist this key
+      assert(on_disk_rollback_info_trimmed_to == eversion_t());
+      on_disk_rollback_info_trimmed_to = info.last_update;
+    }
     log = IndexedLog(
       info.last_update,
       info.log_tail,