Merge pull request ceph#60992 from MaxKellermann/test__includes

test: add missing includes Reviewed-by: Casey Bodley <[email protected]>
Matt1360 · Dec 10, 2024 · 41ebce3 · 41ebce3
2 parents d03901b + 1bd5571
commit 41ebce3
Show file tree

Hide file tree

Showing 60 changed files with 103 additions and 3 deletions.
diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc
@@ -10,6 +10,7 @@
 #include "common/config.h"
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
+#include "log/Log.h"
 
 #define dout_context g_ceph_context
 

diff --git a/src/test/client/TestClient.h b/src/test/client/TestClient.h
@@ -20,6 +20,7 @@
 #include "msg/Messenger.h"
 #include "mon/MonClient.h"
 #include "osdc/ObjectCacher.h"
+#include "osdc/Objecter.h"
 #include "client/MetaRequest.h"
 #include "client/Client.h"
 #include "messages/MClientReclaim.h"

diff --git a/src/test/cls_rgw/test_cls_rgw_stats.cc b/src/test/cls_rgw/test_cls_rgw_stats.cc
@@ -10,6 +10,7 @@
 #include "common/dout.h"
 #include "common/errno.h"
 #include "common/random_string.h"
+#include "include/random.h" // for ceph::util::generate_random_number()
 #include "global/global_context.h"
 #include "test/librados/test_cxx.h"
 

diff --git a/src/test/common/test_async_shared_mutex.cc b/src/test/common/test_async_shared_mutex.cc
@@ -15,6 +15,7 @@
 #include "common/async/shared_mutex.h"
 #include <future>
 #include <optional>
+#include <shared_mutex> // for std::shared_lock
 #include <boost/asio/bind_executor.hpp>
 #include <boost/asio/io_context.hpp>
 #include <gtest/gtest.h>

diff --git a/src/test/crimson/test_messenger_thrash.cc b/src/test/crimson/test_messenger_thrash.cc
@@ -22,6 +22,8 @@
 #include "crimson/net/Messenger.h"
 #include "test/crimson/ctest_utils.h"
 
+#include <boost/random/uniform_int.hpp>
+
 using namespace std::chrono_literals;
 namespace bpo = boost::program_options;
 using crimson::common::local_conf;

diff --git a/src/test/crimson/test_monc.cc b/src/test/crimson/test_monc.cc
@@ -2,6 +2,7 @@
 #include "common/ceph_argparse.h"
 #include "crimson/common/auth_handler.h"
 #include "crimson/common/config_proxy.h"
+#include "crimson/common/perf_counters_collection.h"
 #include "crimson/mon/MonClient.h"
 #include "crimson/net/Connection.h"
 #include "crimson/net/Messenger.h"

diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc
@@ -15,6 +15,7 @@
 
 #include "os/ObjectStore.h"
 #include "global/global_init.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "include/intarith.h"
 #include "include/stringify.h"
@@ -29,6 +30,12 @@
 #include "include/ceph_assert.h" // fio.h clobbers our assert.h
 #include <algorithm>
 
+#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#include "crimson/common/perf_counters_collection.h"
+#else
+#include "common/perf_counters_collection.h"
+#endif
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_
 

diff --git a/src/test/immutable_object_cache/test_DomainSocket.cc b/src/test/immutable_object_cache/test_DomainSocket.cc
@@ -6,13 +6,15 @@
 
 #include "gtest/gtest.h"
 #include "include/Context.h"
+#include "include/unordered_set.h"
 #include "global/global_init.h"
 #include "global/global_context.h"
 
 #include "test/immutable_object_cache/test_common.h"
 #include "tools/immutable_object_cache/CacheClient.h"
 #include "tools/immutable_object_cache/CacheServer.h"
 
+using ceph::unordered_set;
 using namespace ceph::immutable_obj_cache;
 
 class TestCommunication :public ::testing::Test {

diff --git a/src/test/librados/aio_cxx.cc b/src/test/librados/aio_cxx.cc
@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <fcntl.h>
+#include <deque>
 #include <sstream>
 #include <string>
 #include <utility>

diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc
@@ -12,6 +12,8 @@
 #include "include/scope_guard.h"
 #include "include/stringify.h"
 #include "common/Checksummer.h"
+#include "common/Clock.h" // for ceph_clock_now()
+#include "common/config_proxy.h" // for class ConfigProxy
 #include "global/global_context.h"
 #include "test/librados/test.h"
 #include "test/librados/TestCase.h"

diff --git a/src/test/librados/misc_cxx.cc b/src/test/librados/misc_cxx.cc
@@ -16,6 +16,7 @@
 #include "include/scope_guard.h"
 #include "include/stringify.h"
 #include "common/Checksummer.h"
+#include "common/config_proxy.h" // for class ConfigProxy
 #include "mds/mdstypes.h"
 #include "global/global_context.h"
 #include "test/librados/testcase_cxx.h"

diff --git a/src/test/librados/test_common.cc b/src/test/librados/test_common.cc
@@ -2,6 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "common/Formatter.h"
+#include "include/ceph_assert.h"
 #include "include/stringify.h"
 #include "json_spirit/json_spirit.h"
 #include "test_common.h"

diff --git a/src/test/librados_test_stub/TestMemIoCtxImpl.cc b/src/test/librados_test_stub/TestMemIoCtxImpl.cc
@@ -6,6 +6,7 @@
 #include "common/Clock.h"
 #include "include/err.h"
 #include <functional>
+#include <shared_mutex> // for std::shared_lock
 #include <boost/algorithm/string/predicate.hpp>
 #include <errno.h>
 #include <include/compat.h>

diff --git a/src/test/librados_test_stub/TestMemRadosClient.cc b/src/test/librados_test_stub/TestMemRadosClient.cc
@@ -5,6 +5,7 @@
 #include "test/librados_test_stub/TestMemCluster.h"
 #include "test/librados_test_stub/TestMemIoCtxImpl.h"
 #include <errno.h>
+#include <shared_mutex> // for std::shared_lock
 #include <sstream>
 
 namespace librados {

diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc
@@ -60,6 +60,7 @@
 #include "include/rados/librados.hpp"
 #include "include/rbd/librbd.h"
 #include "include/rbd/librbd.hpp"
+#include "include/rbd_types.h" // for RBD_DATA_PREFIX
 #include "common/Cond.h"
 #include "common/SubProcess.h"
 #include "common/safe_io.h"

diff --git a/src/test/librbd/io/test_mock_ImageRequest.cc b/src/test/librbd/io/test_mock_ImageRequest.cc
@@ -10,6 +10,8 @@
 #include "librbd/io/ObjectDispatchSpec.h"
 #include "librbd/io/Utils.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace {
 

diff --git a/src/test/librbd/journal/test_Replay.cc b/src/test/librbd/journal/test_Replay.cc
@@ -22,6 +22,8 @@
 #include "librbd/io/ReadResult.h"
 #include "librbd/journal/Types.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 void register_test_journal_replay() {
 }
 

diff --git a/src/test/librbd/mock/MockObjectMap.h b/src/test/librbd/mock/MockObjectMap.h
@@ -8,6 +8,8 @@
 #include "librbd/Utils.h"
 #include "gmock/gmock.h"
 
+#include <boost/optional/optional_io.hpp>
+
 namespace librbd {
 
 struct MockObjectMap {

diff --git a/src/test/librbd/object_map/test_mock_InvalidateRequest.cc b/src/test/librbd/object_map/test_mock_InvalidateRequest.cc
@@ -10,6 +10,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace object_map {
 

diff --git a/src/test/librbd/object_map/test_mock_SnapshotCreateRequest.cc b/src/test/librbd/object_map/test_mock_SnapshotCreateRequest.cc
@@ -12,6 +12,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace object_map {
 

diff --git a/src/test/librbd/object_map/test_mock_SnapshotRemoveRequest.cc b/src/test/librbd/object_map/test_mock_SnapshotRemoveRequest.cc
@@ -12,6 +12,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace object_map {
 

diff --git a/src/test/librbd/object_map/test_mock_SnapshotRollbackRequest.cc b/src/test/librbd/object_map/test_mock_SnapshotRollbackRequest.cc
@@ -11,6 +11,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace object_map {
 

diff --git a/src/test/librbd/object_map/test_mock_UpdateRequest.cc b/src/test/librbd/object_map/test_mock_UpdateRequest.cc
@@ -14,6 +14,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace object_map {
 

diff --git a/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc b/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc
@@ -20,6 +20,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 
 namespace {

diff --git a/src/test/librbd/operation/test_mock_EnableFeaturesRequest.cc b/src/test/librbd/operation/test_mock_EnableFeaturesRequest.cc
@@ -19,6 +19,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 
 namespace {

diff --git a/src/test/librbd/operation/test_mock_Request.cc b/src/test/librbd/operation/test_mock_Request.cc
@@ -8,6 +8,8 @@
 #include "librbd/AsyncRequest.h"
 #include "librbd/operation/Request.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace {
 

diff --git a/src/test/librbd/operation/test_mock_ResizeRequest.cc b/src/test/librbd/operation/test_mock_ResizeRequest.cc
@@ -14,6 +14,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 
 namespace util {

diff --git a/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc b/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc
@@ -13,6 +13,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace mirror {
 namespace snapshot {

diff --git a/src/test/librbd/operation/test_mock_SnapshotProtectRequest.cc b/src/test/librbd/operation/test_mock_SnapshotProtectRequest.cc
@@ -15,6 +15,8 @@
 // template definitions
 #include "librbd/operation/SnapshotProtectRequest.cc"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace operation {
 

diff --git a/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc b/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc
@@ -15,6 +15,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace image {
 

diff --git a/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc b/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc
@@ -14,6 +14,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 
 namespace {

diff --git a/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc b/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc
@@ -17,6 +17,8 @@
 // template definitions
 #include "librbd/operation/SnapshotUnprotectRequest.cc"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace operation {
 

diff --git a/src/test/librbd/operation/test_mock_TrimRequest.cc b/src/test/librbd/operation/test_mock_TrimRequest.cc
@@ -16,6 +16,8 @@
 #include "gtest/gtest.h"
 #include <boost/variant.hpp>
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 namespace {
 

diff --git a/src/test/librbd/test_DeepCopy.cc b/src/test/librbd/test_DeepCopy.cc
@@ -11,6 +11,8 @@
 #include "librbd/io/ReadResult.h"
 #include "test/librados/crimson_utils.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 void register_test_deep_copy() {
 }
 

diff --git a/src/test/librbd/test_ImageWatcher.cc b/src/test/librbd/test_ImageWatcher.cc
@@ -25,6 +25,7 @@
 #include <iostream>
 #include <map>
 #include <set>
+#include <shared_mutex> // for std::shared_lock
 #include <sstream>
 #include <vector>
 

diff --git a/src/test/librbd/test_Migration.cc b/src/test/librbd/test_Migration.cc
@@ -20,6 +20,8 @@
 #include "common/Cond.h"
 #include <boost/scope_exit.hpp>
 
+#include <shared_mutex> // for std::shared_lock
+
 void register_test_migration() {
 }
 

diff --git a/src/test/librbd/test_ObjectMap.cc b/src/test/librbd/test_ObjectMap.cc
@@ -17,6 +17,8 @@
 #include <boost/accumulators/statistics/stats.hpp>
 #include <boost/accumulators/statistics/rolling_sum.hpp>
 
+#include <shared_mutex> // for std::shared_lock
+
 void register_test_object_map() {
 }
 

diff --git a/src/test/librbd/test_fixture.cc b/src/test/librbd/test_fixture.cc
@@ -17,6 +17,7 @@
 #include "test/librados/test.h"
 #include "test/librados/test_cxx.h"
 #include <iostream>
+#include <shared_mutex> // for std::shared_lock
 #include <sstream>
 #include <stdlib.h>
 

diff --git a/src/test/librbd/test_internal.cc b/src/test/librbd/test_internal.cc
@@ -27,6 +27,7 @@
 #include <boost/scope_exit.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/assign/list_of.hpp>
+#include <shared_mutex> // for std::shared_lock
 #include <utility>
 #include <vector>
 #include "test/librados/crimson_utils.h"

diff --git a/src/test/librbd/test_mock_ExclusiveLock.cc b/src/test/librbd/test_mock_ExclusiveLock.cc
@@ -15,6 +15,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include <list>
+#include <shared_mutex> // for std::shared_lock
 #include <boost/scope_exit.hpp>
 
 namespace librbd {

diff --git a/src/test/librbd/test_mock_Journal.cc b/src/test/librbd/test_mock_Journal.cc
@@ -9,6 +9,7 @@
 #include "test/librbd/mock/io/MockObjectDispatch.h"
 #include "common/Cond.h"
 #include "common/ceph_mutex.h"
+#include "common/debug.h"
 #include "common/WorkQueue.h"
 #include "cls/journal/cls_journal_types.h"
 #include "journal/Journaler.h"
@@ -28,6 +29,7 @@
 #include "gtest/gtest.h"
 #include <functional>
 #include <list>
+#include <shared_mutex> // for std::shared_lock
 #include <boost/scope_exit.hpp>
 
 #define dout_context g_ceph_context

diff --git a/src/test/librbd/test_mock_ObjectMap.cc b/src/test/librbd/test_mock_ObjectMap.cc
@@ -10,6 +10,8 @@
 #include "librbd/object_map/UpdateRequest.h"
 #include <boost/scope_exit.hpp>
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd {
 
 namespace {

diff --git a/src/test/mon/PGMap.cc b/src/test/mon/PGMap.cc
@@ -14,6 +14,7 @@
 #include "mon/PGMap.h"
 #include "gtest/gtest.h"
 
+#include "common/TextTable.h"
 #include "include/stringify.h"
 
 using namespace std;