From: Max Kellermann Date: Wed, 15 Apr 2026 12:38:57 +0000 (+0200) Subject: test: add missing includes X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6f3de9bbabaf0a8ef3fa968e9f26ca4d1340835;p=ceph.git test: add missing includes Signed-off-by: Max Kellermann --- diff --git a/src/test/client/TestClient.h b/src/test/client/TestClient.h index 326478f3e5a..cc3a480b5f7 100644 --- a/src/test/client/TestClient.h +++ b/src/test/client/TestClient.h @@ -27,6 +27,7 @@ #include "client/FSCrypt.h" #include "messages/MClientReclaim.h" #include "messages/MClientSession.h" +#include "common/Cond.h" #include "common/async/blocked_completion.h" #include "fscrypt_conf.h" diff --git a/src/test/common/Throttle.cc b/src/test/common/Throttle.cc index 1f3206439fa..ef42ce4078c 100644 --- a/src/test/common/Throttle.cc +++ b/src/test/common/Throttle.cc @@ -34,6 +34,7 @@ #include "common/Thread.h" #include "common/Throttle.h" #include "common/ceph_argparse.h" +#include "global/global_context.h" // for g_ceph_context using namespace std; diff --git a/src/test/crimson/test_messenger_thrash.cc b/src/test/crimson/test_messenger_thrash.cc index 6c0701bc31e..ebc4a383ab2 100644 --- a/src/test/crimson/test_messenger_thrash.cc +++ b/src/test/crimson/test_messenger_thrash.cc @@ -16,6 +16,7 @@ #include "messages/MPing.h" #include "messages/MCommand.h" #include "crimson/auth/DummyAuth.h" +#include "crimson/common/config_proxy.h" // for local_conf() #include "crimson/common/log.h" #include "crimson/net/Connection.h" #include "crimson/net/Dispatcher.h" diff --git a/src/test/crimson/test_socket.cc b/src/test/crimson/test_socket.cc index 829192e8e5a..ad5c7136756 100644 --- a/src/test/crimson/test_socket.cc +++ b/src/test/crimson/test_socket.cc @@ -11,6 +11,7 @@ #include #include +#include "crimson/common/config_proxy.h" // for local_conf() #include "crimson/common/log.h" #include "crimson/net/Errors.h" #include "crimson/net/Fwd.h" diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc index 91ef8ffacfe..0af50ee6352 100644 --- a/src/test/crush/CrushWrapper.cc +++ b/src/test/crush/CrushWrapper.cc @@ -26,6 +26,7 @@ #include "common/ceph_argparse.h" #include "common/common_init.h" +#include "common/Formatter.h" #include "include/stringify.h" #include "include/Context.h" #include "osd/osd_types.h" diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc index af0c407cce9..c375577422b 100644 --- a/src/test/librados_test_stub/LibradosTestStub.cc +++ b/src/test/librados_test_stub/LibradosTestStub.cc @@ -20,6 +20,7 @@ #include "objclass/objclass.h" #include "osd/osd_types.h" #include +#include #include #include #include diff --git a/src/test/librbd/journal/test_Entries.cc b/src/test/librbd/journal/test_Entries.cc index 6fb4d5185aa..929f9c83ae2 100644 --- a/src/test/librbd/journal/test_Entries.cc +++ b/src/test/librbd/journal/test_Entries.cc @@ -3,6 +3,7 @@ #include "test/librbd/test_fixture.h" #include "test/librbd/test_support.h" +#include "common/Cond.h" #include "librbd/internal.h" #include "librbd/Journal.h" #include "librbd/api/Io.h" diff --git a/src/test/librbd/journal/test_Replay.cc b/src/test/librbd/journal/test_Replay.cc index a2531c222fb..47c8a015287 100644 --- a/src/test/librbd/journal/test_Replay.cc +++ b/src/test/librbd/journal/test_Replay.cc @@ -3,6 +3,7 @@ #include "test/librbd/test_fixture.h" #include "test/librbd/test_support.h" +#include "common/Cond.h" #include "cls/rbd/cls_rbd_types.h" #include "cls/journal/cls_journal_types.h" #include "cls/journal/cls_journal_client.h" diff --git a/src/test/librbd/mock/MockImageCtx.h b/src/test/librbd/mock/MockImageCtx.h index bb8a28a5d5e..a28503ae9bb 100644 --- a/src/test/librbd/mock/MockImageCtx.h +++ b/src/test/librbd/mock/MockImageCtx.h @@ -16,6 +16,7 @@ #include "test/librbd/mock/MockReadahead.h" #include "test/librbd/mock/io/MockImageDispatcher.h" #include "test/librbd/mock/io/MockObjectDispatcher.h" +#include "common/Cond.h" #include "common/WorkQueue.h" #include "common/zipkin_trace.h" #include "librbd/ImageCtx.h" diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc index 2f83bff2a62..46a1ae70eeb 100644 --- a/src/test/mon/test-mon-msg.cc +++ b/src/test/mon/test-mon-msg.cc @@ -39,6 +39,7 @@ #include "common/config.h" #include "include/ceph_assert.h" +#include "msg/Messenger.h" #include "messages/MMonProbe.h" #include "messages/MRoute.h" #include "messages/MGenericMessage.h" diff --git a/src/test/osd/ECPeeringTestFixture.cc b/src/test/osd/ECPeeringTestFixture.cc index 550ccced2f7..56191d8b1ee 100644 --- a/src/test/osd/ECPeeringTestFixture.cc +++ b/src/test/osd/ECPeeringTestFixture.cc @@ -16,6 +16,7 @@ #include "test/osd/ECPeeringTestFixture.h" #include "test/osd/MockECRecPred.h" #include "test/osd/MockECReadPred.h" +#include "crush/crush.h" // for CRUSH_ITEM_NONE // ShardDpp implementation std::ostream& ECPeeringTestFixture::ShardDpp::gen_prefix(std::ostream& out) const { diff --git a/src/test/osd/MockPeeringListener.h b/src/test/osd/MockPeeringListener.h index 5ab119a83ad..3e80de3bc92 100644 --- a/src/test/osd/MockPeeringListener.h +++ b/src/test/osd/MockPeeringListener.h @@ -28,6 +28,12 @@ #include "MockMessenger.h" #include "global/global_context.h" +#ifdef WITH_CRIMSON +#include "crimson/common/perf_counters_collection.h" +#else +#include "common/perf_counters_collection.h" +#endif + // Forward declarations class EventLoop; class ECPeeringTestFixture; diff --git a/src/test/osd/PGBackendTestFixture.cc b/src/test/osd/PGBackendTestFixture.cc index f677f8a01ea..dc7ee46c567 100644 --- a/src/test/osd/PGBackendTestFixture.cc +++ b/src/test/osd/PGBackendTestFixture.cc @@ -15,6 +15,7 @@ #include "test/osd/PGBackendTestFixture.h" #include "common/errno.h" +#include "crush/CrushWrapper.h" #include "messages/MOSDECSubOpWrite.h" #include "messages/MOSDECSubOpWriteReply.h" #include "messages/MOSDECSubOpRead.h" diff --git a/src/test/osd/TestBackendBasics.cc b/src/test/osd/TestBackendBasics.cc index 5f70bc4a9c5..b0acc48f19d 100644 --- a/src/test/osd/TestBackendBasics.cc +++ b/src/test/osd/TestBackendBasics.cc @@ -41,6 +41,7 @@ #include #include "test/osd/PGBackendTestFixture.h" #include "test/osd/TestCommon.h" +#include "crush/CrushWrapper.h" #include "messages/MOSDECSubOpWrite.h" using namespace std; diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc index a804bc99322..0c750c2a9ab 100644 --- a/src/test/osd/TestOSDMap.cc +++ b/src/test/osd/TestOSDMap.cc @@ -10,6 +10,7 @@ #include "common/common_init.h" #include "common/ceph_argparse.h" #include "common/ceph_json.h" +#include "crush/CrushWrapper.h" #include "include/stringify.h" #include diff --git a/src/test/osd/TestPeeringState.cc b/src/test/osd/TestPeeringState.cc index 85c373ffca8..f77898f16a0 100644 --- a/src/test/osd/TestPeeringState.cc +++ b/src/test/osd/TestPeeringState.cc @@ -35,7 +35,9 @@ #include "test/osd/MockECRecPred.h" #include "test/osd/MockECReadPred.h" #include "test/osd/MockPeeringListener.h" +#include "crush/CrushWrapper.h" #include "global/global_init.h" +#include "log/Log.h" #include "messages/MOSDPeeringOp.h" #include "msg/Connection.h" #include "os/ObjectStore.h" diff --git a/src/test/osdc/object_cacher_misc.cc b/src/test/osdc/object_cacher_misc.cc index 0ee408e5cf1..bdd8668fac4 100644 --- a/src/test/osdc/object_cacher_misc.cc +++ b/src/test/osdc/object_cacher_misc.cc @@ -12,6 +12,7 @@ #include "common/ceph_mutex.h" #include "common/Clock.h" // for ceph_clock_now() #include "common/common_init.h" +#include "common/Cond.h" #include "common/config.h" #include "common/snap_types.h" #include "global/global_init.h" diff --git a/src/test/osdc/object_cacher_stress.cc b/src/test/osdc/object_cacher_stress.cc index fc80ff0a463..6aec3384e04 100644 --- a/src/test/osdc/object_cacher_stress.cc +++ b/src/test/osdc/object_cacher_stress.cc @@ -11,6 +11,7 @@ #include "common/ceph_argparse.h" #include "common/ceph_mutex.h" #include "common/common_init.h" +#include "common/Cond.h" #include "common/config.h" #include "common/snap_types.h" #include "global/global_init.h" diff --git a/src/test/rbd_mirror/test_ImageDeleter.cc b/src/test/rbd_mirror/test_ImageDeleter.cc index b44adec2f4a..d24fa8540cc 100644 --- a/src/test/rbd_mirror/test_ImageDeleter.cc +++ b/src/test/rbd_mirror/test_ImageDeleter.cc @@ -12,6 +12,8 @@ * Foundation. See file COPYING. * */ + +#include "common/Cond.h" #include "include/rados/librados.hpp" #include "include/rbd/librbd.hpp" #include "include/stringify.h" diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc index 2c1202a2e9c..c0c896ca2ab 100644 --- a/src/test/rbd_mirror/test_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_ImageReplayer.cc @@ -16,6 +16,7 @@ */ #include "common/Clock.h" // for ceph_clock_now() +#include "common/Cond.h" #include "include/rados/librados.hpp" #include "include/rbd/librbd.hpp" #include "include/stringify.h"