]> 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:59:52 +0000 (17:29 +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 7c0aa30ab6a88acf92c1c83a620034eaf76dcd34..db391d644e7e2c8334592b7ff5aab8e3733f4355 100644 (file)
@@ -119,7 +119,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;