From: Samuel Just <sjust@redhat.com>
Date: Fri, 29 Mar 2024 22:47:49 +0000 (-0700)
Subject: osd/PrimaryLogPG: adjust assert in log_operation
X-Git-Tag: v20.0.0~707^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8116c88ea1c3ed84d7a7a30cc5e535c14c2255eb;p=ceph.git

osd/PrimaryLogPG: adjust assert in log_operation

It wouldn't actually be wrong for the primary to trim the log right up
to the pg_committed_to bound it is propagating (though it generally
won't).

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h
index 3ad7d41f16b..9ee305165e3 100644
--- a/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@ -502,7 +502,7 @@ public:
     ObjectStore::Transaction &t,
     bool async = false) override {
     if (is_primary()) {
-      ceph_assert(trim_to <= recovery_state.get_pg_committed_to());
+      ceph_assert(trim_to <= pg_committed_to);
     }
     if (hset_history) {
       recovery_state.update_hset(*hset_history);