From 931a644f1a0c99187db720c67a5968fc54fe8394 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 10 Oct 2025 12:04:53 +0100 Subject: [PATCH] trim caps fix with output message fix --- src/osd/PeeringState.cc | 4 ++-- src/test/fs/CMakeLists.txt | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc index 9669819a572..5faccc1385e 100644 --- a/src/osd/PeeringState.cc +++ b/src/osd/PeeringState.cc @@ -3506,13 +3506,13 @@ void PeeringState::proc_master_log( invalidate_stats = false; psdout(10) << "keeping stats for " << shard << " (wanted last update: " << olog.head - << ", stats last update: " << stats_last_update[shard] + << ", stats last update: " << my_info.stats.version << ", shard last update: " << my_info.last_update << ")." << dendl; } else { psdout(20) << "not using stats for " << shard << " (wanted last update: " << olog.head - << ", stats last update: " << stats_last_update[shard] + << ", stats last update: " << my_info.stats.version << ", shard last update: " << my_info.last_update << ")." << dendl; } diff --git a/src/test/fs/CMakeLists.txt b/src/test/fs/CMakeLists.txt index 36045fe95f8..ba48aad128d 100644 --- a/src/test/fs/CMakeLists.txt +++ b/src/test/fs/CMakeLists.txt @@ -6,14 +6,6 @@ if(${WITH_CEPHFS}) add_ceph_unittest(unittest_mds_types) target_link_libraries(unittest_mds_types global) - add_executable(ceph_test_trim_caps - test_trim_caps.cc - ) - target_link_libraries(ceph_test_trim_caps - cephfs - ) - install(TARGETS ceph_test_trim_caps DESTINATION ${CMAKE_INSTALL_BINDIR}) - add_executable(ceph_test_ino_release_cb test_ino_release_cb.cc ) -- 2.39.5