]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cephfs-journal-tool:: Don't reset the journal trim position
authorKotresh HR <khiremat@redhat.com>
Thu, 18 Sep 2025 06:41:11 +0000 (06:41 +0000)
committerKotresh HR <khiremat@redhat.com>
Fri, 19 Sep 2025 11:58:44 +0000 (17:28 +0530)
If the fs had to go through journal recovery and reset,
the cephfs-journal-tool resets the journal trim position
because of which the old unused journal objects just stay
forever in the metadata pool. The patch fixes the issue.
Now, the old stale journal objects are trimmed during the
regular trimming cycle helping to recover space in the
metadata pool.

Fixes: https://tracker.ceph.com/issues/69708
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 4f9a926a467c03a410e5ec5a81031e72f2193f25)

src/tools/cephfs/Resetter.cc

index 151a2e22e44128a8e1507a9547048b5af339774a..5f8c4bf121d8415b9940de238c5dc36753a4ac1e 100644 (file)
@@ -117,7 +117,6 @@ int Resetter::reset()
   journaler.set_read_pos(new_start);
   journaler.set_write_pos(new_start);
   journaler.set_expire_pos(new_start);
-  journaler.set_trimmed_pos(new_start);
   journaler.set_writeable();
 
   cout << "writing journal head" << std::endl;