From: Kotresh HR Date: Thu, 18 Sep 2025 06:41:11 +0000 (+0000) Subject: cephfs-journal-tool:: Don't reset the journal trim position X-Git-Tag: testing/wip-jcollin-testing-20250924.083816-reef~4^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=21449be087aabba09fd45efe4063aa5786e08872;p=ceph-ci.git cephfs-journal-tool:: Don't reset the journal trim position 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 (cherry picked from commit 4f9a926a467c03a410e5ec5a81031e72f2193f25) --- diff --git a/src/tools/cephfs/Resetter.cc b/src/tools/cephfs/Resetter.cc index 7c0aa30ab6a..db391d644e7 100644 --- a/src/tools/cephfs/Resetter.cc +++ b/src/tools/cephfs/Resetter.cc @@ -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;