From: Max Kellermann Date: Sat, 26 Oct 2024 18:03:07 +0000 (+0200) Subject: tools: add missing includes X-Git-Tag: v20.0.0~186^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=691ed012600cc693bce9c8f22f282045f40676a9;p=ceph.git tools: add missing includes Signed-off-by: Max Kellermann --- diff --git a/src/tools/ceph_authtool.cc b/src/tools/ceph_authtool.cc index bf0bd5523ec..da7957c9d2c 100644 --- a/src/tools/ceph_authtool.cc +++ b/src/tools/ceph_authtool.cc @@ -15,6 +15,7 @@ #include "common/ConfUtils.h" #include "common/ceph_argparse.h" #include "common/config_proxy.h" +#include "common/strtol.h" #include "global/global_context.h" #include "global/global_init.h" diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc index 1d1fc1f7725..700a7fc46bf 100644 --- a/src/tools/ceph_conf.cc +++ b/src/tools/ceph_conf.cc @@ -17,6 +17,7 @@ #include "common/ceph_argparse.h" #include "global/global_init.h" +#include "log/Log.h" #include "mon/AuthMonitor.h" #include "common/Formatter.h" diff --git a/src/tools/ceph_dedup/ceph_dedup_daemon.cc b/src/tools/ceph_dedup/ceph_dedup_daemon.cc index 9b5dd8bee77..dd9646493d6 100644 --- a/src/tools/ceph_dedup/ceph_dedup_daemon.cc +++ b/src/tools/ceph_dedup/ceph_dedup_daemon.cc @@ -1,4 +1,7 @@ #include "common.h" +#include "log/Log.h" + +#include // for std::shared_lock #undef dout_prefix #define dout_prefix *_dout << "ceph_dedup_daemon: " \ diff --git a/src/tools/ceph_dedup/ceph_dedup_tool.cc b/src/tools/ceph_dedup/ceph_dedup_tool.cc index c35c4c1facb..2d37514cdfa 100644 --- a/src/tools/ceph_dedup/ceph_dedup_tool.cc +++ b/src/tools/ceph_dedup/ceph_dedup_tool.cc @@ -13,6 +13,9 @@ */ #include "common.h" +#include "log/Log.h" + +#include struct EstimateResult { std::unique_ptr cdc; diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc index bcb90c8fe46..738fdedf6b4 100644 --- a/src/tools/ceph_kvstore_tool.cc +++ b/src/tools/ceph_kvstore_tool.cc @@ -20,6 +20,7 @@ #include "common/errno.h" #include "common/strtol.h" #include "common/url_escape.h" +#include "include/types.h" // for struct byte_u_t #include "global/global_context.h" #include "global/global_init.h" diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index a7f6e273258..9b880c4d360 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -24,6 +25,7 @@ #include "common/Formatter.h" #include "common/errno.h" #include "common/ceph_argparse.h" +#include "common/perf_counters_collection.h" #include "common/url_escape.h" #include "global/global_init.h" diff --git a/src/tools/cephfs/DataScan.cc b/src/tools/cephfs/DataScan.cc index 281af410c2a..bdc02ed481f 100644 --- a/src/tools/cephfs/DataScan.cc +++ b/src/tools/cephfs/DataScan.cc @@ -12,7 +12,10 @@ * */ +#include "DataScan.h" + #include "include/compat.h" +#include "common/debug.h" #include "common/errno.h" #include "common/ceph_argparse.h" #include @@ -27,7 +30,6 @@ #include "cls/cephfs/cls_cephfs_client.h" #include "PgFiles.h" -#include "DataScan.h" #include "include/compat.h" #define dout_context g_ceph_context diff --git a/src/tools/cephfs/DataScan.h b/src/tools/cephfs/DataScan.h index 4b8f34bf69a..aea9b5242ee 100644 --- a/src/tools/cephfs/DataScan.h +++ b/src/tools/cephfs/DataScan.h @@ -16,6 +16,7 @@ #include "MDSUtility.h" #include "include/rados/librados.hpp" +struct inode_backtrace_t; class InodeStore; class MDSTable; diff --git a/src/tools/cephfs/Dumper.cc b/src/tools/cephfs/Dumper.cc index 9393ef9d975..772fb71c585 100644 --- a/src/tools/cephfs/Dumper.cc +++ b/src/tools/cephfs/Dumper.cc @@ -12,8 +12,11 @@ * */ +#include "Dumper.h" + #include "include/compat.h" #include "include/fs_types.h" +#include "common/debug.h" #include "common/entity_name.h" #include "common/errno.h" #include "common/safe_io.h" @@ -23,8 +26,6 @@ #include "osdc/Journaler.h" #include "mon/MonClient.h" -#include "Dumper.h" - #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/tools/cephfs/JournalFilter.cc b/src/tools/cephfs/JournalFilter.cc index 3a5e781a2db..3818099851d 100644 --- a/src/tools/cephfs/JournalFilter.cc +++ b/src/tools/cephfs/JournalFilter.cc @@ -15,6 +15,8 @@ #include "JournalFilter.h" #include "common/ceph_argparse.h" +#include "common/debug.h" +#include "common/strtol.h" // for strict_strtoll() #include "mds/events/ESession.h" #include "mds/events/EUpdate.h" diff --git a/src/tools/cephfs/JournalScanner.cc b/src/tools/cephfs/JournalScanner.cc index e72542fd4a0..602419349c6 100644 --- a/src/tools/cephfs/JournalScanner.cc +++ b/src/tools/cephfs/JournalScanner.cc @@ -11,15 +11,15 @@ * foundation. see file copying. */ +#include "JournalScanner.h" +#include "common/debug.h" #include "include/rados/librados.hpp" #include "mds/JournalPointer.h" #include "mds/events/ESubtreeMap.h" #include "mds/PurgeQueue.h" -#include "JournalScanner.h" - #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/tools/cephfs/JournalTool.cc b/src/tools/cephfs/JournalTool.cc index b204cbef1b0..e34163fd6af 100644 --- a/src/tools/cephfs/JournalTool.cc +++ b/src/tools/cephfs/JournalTool.cc @@ -15,6 +15,7 @@ #include #include "common/ceph_argparse.h" +#include "common/debug.h" #include "common/errno.h" #include "osdc/Journaler.h" #include "mds/mdstypes.h" diff --git a/src/tools/cephfs/MDSUtility.cc b/src/tools/cephfs/MDSUtility.cc index 54386d2199f..d554d4724c2 100644 --- a/src/tools/cephfs/MDSUtility.cc +++ b/src/tools/cephfs/MDSUtility.cc @@ -13,6 +13,7 @@ #include "MDSUtility.h" #include "mon/MonClient.h" +#include "common/debug.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/tools/cephfs/MetaTool.cc b/src/tools/cephfs/MetaTool.cc index f80baa2f83b..d0d131ef9a0 100644 --- a/src/tools/cephfs/MetaTool.cc +++ b/src/tools/cephfs/MetaTool.cc @@ -8,6 +8,7 @@ #include "include/types.h" #include "common/Formatter.h" #include "common/ceph_argparse.h" +#include "common/debug.h" #include "common/errno.h" #include "osdc/Journaler.h" #include "mds/mdstypes.h" diff --git a/src/tools/cephfs/PgFiles.cc b/src/tools/cephfs/PgFiles.cc index 2abca722335..1bf7885aa9f 100644 --- a/src/tools/cephfs/PgFiles.cc +++ b/src/tools/cephfs/PgFiles.cc @@ -12,6 +12,7 @@ * */ +#include "common/debug.h" #include "common/errno.h" #include "osdc/Striper.h" diff --git a/src/tools/cephfs/Resetter.cc b/src/tools/cephfs/Resetter.cc index 151a2e22e44..92996fd9685 100644 --- a/src/tools/cephfs/Resetter.cc +++ b/src/tools/cephfs/Resetter.cc @@ -11,7 +11,11 @@ * Foundation. See file COPYING. * */ + +#include "Resetter.h" + #include +#include "common/debug.h" #include "common/errno.h" #include "osdc/Journaler.h" #include "mds/JournalPointer.h" @@ -21,8 +25,6 @@ #include "mon/MonClient.h" #include "mds/events/EResetJournal.h" -#include "Resetter.h" - #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/tools/cephfs/RoleSelector.cc b/src/tools/cephfs/RoleSelector.cc index e8f9d7f12d7..a270f9aa2e9 100644 --- a/src/tools/cephfs/RoleSelector.cc +++ b/src/tools/cephfs/RoleSelector.cc @@ -1,5 +1,6 @@ #include "RoleSelector.h" +#include "common/strtol.h" int MDSRoleSelector::parse_rank( const FSMap &fsmap, diff --git a/src/tools/cephfs/TableTool.cc b/src/tools/cephfs/TableTool.cc index 78fc5965823..c07828f364e 100644 --- a/src/tools/cephfs/TableTool.cc +++ b/src/tools/cephfs/TableTool.cc @@ -13,6 +13,7 @@ #include "common/ceph_argparse.h" +#include "common/debug.h" #include "common/errno.h" #include "mds/SessionMap.h" diff --git a/src/tools/cephfs_mirror/FSMirror.cc b/src/tools/cephfs_mirror/FSMirror.cc index ea1857b1eba..2b181c97255 100644 --- a/src/tools/cephfs_mirror/FSMirror.cc +++ b/src/tools/cephfs_mirror/FSMirror.cc @@ -9,6 +9,7 @@ #include "common/errno.h" #include "common/WorkQueue.h" #include "common/perf_counters.h" +#include "common/perf_counters_collection.h" #include "common/perf_counters_key.h" #include "include/stringify.h" #include "msg/Messenger.h" diff --git a/src/tools/cephfs_mirror/Mirror.cc b/src/tools/cephfs_mirror/Mirror.cc index 397adb4f8c0..004242430a4 100644 --- a/src/tools/cephfs_mirror/Mirror.cc +++ b/src/tools/cephfs_mirror/Mirror.cc @@ -10,6 +10,7 @@ #include "common/Timer.h" #include "common/WorkQueue.h" #include "common/perf_counters.h" +#include "common/perf_counters_collection.h" #include "common/perf_counters_key.h" #include "include/types.h" #include "mon/MonClient.h" diff --git a/src/tools/cephfs_mirror/PeerReplayer.cc b/src/tools/cephfs_mirror/PeerReplayer.cc index 77e93ef6a99..535cd49cc75 100644 --- a/src/tools/cephfs_mirror/PeerReplayer.cc +++ b/src/tools/cephfs_mirror/PeerReplayer.cc @@ -14,7 +14,9 @@ #include "common/debug.h" #include "common/errno.h" #include "common/perf_counters.h" +#include "common/perf_counters_collection.h" #include "common/perf_counters_key.h" +#include "include/stringify.h" #include "FSMirror.h" #include "PeerReplayer.h" #include "Utils.h" diff --git a/src/tools/cephfs_mirror/PeerReplayer.h b/src/tools/cephfs_mirror/PeerReplayer.h index 32c71301f00..cd948b8300e 100644 --- a/src/tools/cephfs_mirror/PeerReplayer.h +++ b/src/tools/cephfs_mirror/PeerReplayer.h @@ -10,6 +10,8 @@ #include "ServiceDaemon.h" #include "Types.h" +#include + namespace cephfs { namespace mirror { diff --git a/src/tools/cephfs_mirror/ServiceDaemon.cc b/src/tools/cephfs_mirror/ServiceDaemon.cc index f66dd46bf7f..c19e121beae 100644 --- a/src/tools/cephfs_mirror/ServiceDaemon.cc +++ b/src/tools/cephfs_mirror/ServiceDaemon.cc @@ -1,11 +1,12 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab +#include "ServiceDaemon.h" #include "common/debug.h" #include "common/errno.h" #include "common/Timer.h" +#include "include/Context.h" #include "include/stringify.h" -#include "ServiceDaemon.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_cephfs_mirror diff --git a/src/tools/cephfs_mirror/Types.h b/src/tools/cephfs_mirror/Types.h index fda9bdca4eb..ac52552a638 100644 --- a/src/tools/cephfs_mirror/Types.h +++ b/src/tools/cephfs_mirror/Types.h @@ -12,6 +12,8 @@ #include "include/cephfs/libcephfs.h" #include "mds/mdstypes.h" +#include + namespace cephfs { namespace mirror { diff --git a/src/tools/cephfs_mirror/main.cc b/src/tools/cephfs_mirror/main.cc index 4abb895a007..93d3e018d81 100644 --- a/src/tools/cephfs_mirror/main.cc +++ b/src/tools/cephfs_mirror/main.cc @@ -9,6 +9,7 @@ #include "common/Preforker.h" #include "global/global_init.h" #include "global/signal_handler.h" +#include "log/Log.h" #include "mon/MonClient.h" #include "msg/Messenger.h" #include "Mirror.h" diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc index acfc9a3c6f7..a1a55422bf4 100644 --- a/src/tools/crushtool.cc +++ b/src/tools/crushtool.cc @@ -27,6 +27,7 @@ #include "common/errno.h" #include "common/config.h" #include "common/Formatter.h" +#include "common/strtol.h" // for strict_strtol() #include "common/ceph_argparse.h" #include "include/stringify.h" diff --git a/src/tools/immutable_object_cache/SimplePolicy.cc b/src/tools/immutable_object_cache/SimplePolicy.cc index 3a7375ba976..b208ba5008b 100644 --- a/src/tools/immutable_object_cache/SimplePolicy.cc +++ b/src/tools/immutable_object_cache/SimplePolicy.cc @@ -4,6 +4,8 @@ #include "common/debug.h" #include "SimplePolicy.h" +#include // for std::shared_lock + #define dout_context g_ceph_context #define dout_subsys ceph_subsys_immutable_obj_cache #undef dout_prefix diff --git a/src/tools/kvstore_tool.cc b/src/tools/kvstore_tool.cc index 720d1150650..997180d9706 100644 --- a/src/tools/kvstore_tool.cc +++ b/src/tools/kvstore_tool.cc @@ -5,13 +5,19 @@ #include +#include "common/config_proxy.h" // for class ConfigProxy #include "common/errno.h" #include "common/url_escape.h" #include "common/pretty_binary.h" +#include "global/global_context.h" // for g_conf() #include "include/buffer.h" -#include "kv/KeyValueDB.h" +#include "include/types.h" // for struct byte_u_t #include "kv/KeyValueHistogram.h" +#ifdef WITH_BLUESTORE +#include "os/bluestore/BlueStore.h" +#endif + using namespace std; StoreTool::StoreTool(const string& type, diff --git a/src/tools/kvstore_tool.h b/src/tools/kvstore_tool.h index a0b906e9658..02e64627882 100644 --- a/src/tools/kvstore_tool.h +++ b/src/tools/kvstore_tool.h @@ -9,6 +9,7 @@ #include "acconfig.h" #include "include/buffer_fwd.h" +#include "kv/KeyValueDB.h" #ifdef WITH_BLUESTORE #include "os/bluestore/BlueStore.h" #endif diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc index dc882a006a2..1e9b41e436d 100644 --- a/src/tools/monmaptool.cc +++ b/src/tools/monmaptool.cc @@ -14,8 +14,11 @@ #include #include "common/ceph_argparse.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/errno.h" +#include "common/strtol.h" +#include "global/global_context.h" #include "global/global_init.h" #include "include/str_list.h" #include "mon/MonMap.h" diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc index 56e86c84591..b1e594d14f4 100644 --- a/src/tools/osdmaptool.cc +++ b/src/tools/osdmaptool.cc @@ -18,6 +18,9 @@ #include "common/ceph_argparse.h" #include "common/errno.h" #include "common/safe_io.h" +#include "common/strtol.h" // for strict_strtoll() +#include "crush/CrushWrapper.h" +#include "include/unordered_map.h" #include "include/random.h" #include "mon/health_check.h" #include diff --git a/src/tools/rados/PoolDump.cc b/src/tools/rados/PoolDump.cc index 9f51a139163..df380afc89f 100644 --- a/src/tools/rados/PoolDump.cc +++ b/src/tools/rados/PoolDump.cc @@ -13,6 +13,7 @@ */ #include "include/rados/librados.hpp" +#include "common/debug.h" #include "common/errno.h" #include "PoolDump.h" diff --git a/src/tools/rados/RadosImport.cc b/src/tools/rados/RadosImport.cc index 0b27c077b21..cb554488598 100644 --- a/src/tools/rados/RadosImport.cc +++ b/src/tools/rados/RadosImport.cc @@ -12,11 +12,10 @@ * */ - -#include "common/errno.h" - -#include "osd/PGLog.h" #include "RadosImport.h" +#include "osd/PGLog.h" +#include "common/debug.h" +#include "common/errno.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rados diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index 9dfe9d36c0c..fb725568409 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -32,6 +32,7 @@ #include "common/errno.h" #include "common/Formatter.h" #include "common/obj_bencher.h" +#include "common/strtol.h" // for strict_strtoll() #include "common/TextTable.h" #include "include/stringify.h" #include "mds/inode_backtrace.h" @@ -62,6 +63,10 @@ #include "objclass/objclass.h" #include "cls/refcount/cls_refcount_ops.h" +#include + +#include + using namespace std::chrono_literals; using namespace librados; using ceph::util::generate_random_number; diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc index b20dca05bc6..bad7d5bdefe 100644 --- a/src/tools/rbd/Utils.cc +++ b/src/tools/rbd/Utils.cc @@ -11,6 +11,7 @@ #include "common/config.h" #include "common/errno.h" #include "common/escape.h" +#include "common/Formatter.h" #include "common/safe_io.h" #include "global/global_context.h" #include diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc index 6a546c3f73a..9c08afed35c 100644 --- a/src/tools/rbd/action/MirrorPool.cc +++ b/src/tools/rbd/action/MirrorPool.cc @@ -14,6 +14,7 @@ #include "common/debug.h" #include "common/errno.h" #include "common/Formatter.h" +#include "common/safe_io.h" // for safe_read() #include "common/TextTable.h" #include "common/Throttle.h" #include "global/global_context.h" diff --git a/src/tools/rbd/action/Perf.cc b/src/tools/rbd/action/Perf.cc index 788162c6626..8330a414513 100644 --- a/src/tools/rbd/action/Perf.cc +++ b/src/tools/rbd/action/Perf.cc @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/src/tools/rbd/action/Pool.cc b/src/tools/rbd/action/Pool.cc index 2ad8e17ff8e..13970a01d3c 100644 --- a/src/tools/rbd/action/Pool.cc +++ b/src/tools/rbd/action/Pool.cc @@ -5,6 +5,7 @@ #include "tools/rbd/Shell.h" #include "tools/rbd/Utils.h" #include "include/stringify.h" +#include "include/types.h" // for struct byte_u_t #include "common/errno.h" #include "common/Formatter.h" #include diff --git a/src/tools/rbd_mirror/ImageMap.h b/src/tools/rbd_mirror/ImageMap.h index 011d73c94f9..b17437b7706 100644 --- a/src/tools/rbd_mirror/ImageMap.h +++ b/src/tools/rbd_mirror/ImageMap.h @@ -7,6 +7,7 @@ #include #include "common/ceph_mutex.h" +#include "common/Clock.h" // for ceph_clock_now() #include "include/Context.h" #include "common/AsyncOpTracker.h" #include "cls/rbd/cls_rbd_types.h" diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 438e3c11d06..6c3553dd941 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -29,6 +29,9 @@ #include "tools/rbd_mirror/image_replayer/journal/Replayer.h" #include "tools/rbd_mirror/image_replayer/journal/StateBuilder.h" #include +#include // for std::shared_lock + +#include #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror diff --git a/src/tools/rbd_mirror/ImageSync.cc b/src/tools/rbd_mirror/ImageSync.cc index 43d0c666338..b0434bef6c5 100644 --- a/src/tools/rbd_mirror/ImageSync.cc +++ b/src/tools/rbd_mirror/ImageSync.cc @@ -19,6 +19,8 @@ #include "tools/rbd_mirror/image_sync/SyncPointPruneRequest.h" #include "tools/rbd_mirror/image_sync/Types.h" +#include // for std::shared_lock + #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix diff --git a/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc b/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc index 19a98804c71..440d1598baf 100644 --- a/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc +++ b/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc @@ -12,6 +12,8 @@ #include "librbd/journal/Policy.h" #include "tools/rbd_mirror/image_deleter/Types.h" +#include // for std::shared_lock + #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix diff --git a/src/tools/rbd_mirror/image_map/Policy.cc b/src/tools/rbd_mirror/image_map/Policy.cc index 62fbd12dc0b..88f4f269549 100644 --- a/src/tools/rbd_mirror/image_map/Policy.cc +++ b/src/tools/rbd_mirror/image_map/Policy.cc @@ -1,11 +1,15 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab +#include "Policy.h" + #include "common/debug.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/errno.h" #include "librbd/Utils.h" -#include "Policy.h" + +#include // for std::shared_lock #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror diff --git a/src/tools/rbd_mirror/image_map/Policy.h b/src/tools/rbd_mirror/image_map/Policy.h index b256e2f1d8f..79e825ec193 100644 --- a/src/tools/rbd_mirror/image_map/Policy.h +++ b/src/tools/rbd_mirror/image_map/Policy.h @@ -5,10 +5,13 @@ #define CEPH_RBD_MIRROR_IMAGE_MAP_POLICY_H #include +#include +#include #include #include #include "cls/rbd/cls_rbd_types.h" +#include "common/ceph_mutex.h" #include "include/rados/librados.hpp" #include "tools/rbd_mirror/image_map/StateTransition.h" #include "tools/rbd_mirror/image_map/Types.h" diff --git a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc index 641bb03e80f..96717b4edfd 100644 --- a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc @@ -21,6 +21,8 @@ #include "tools/rbd_mirror/image_sync/Utils.h" #include +#include // for std::shared_lock + #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc index 7f8d9608eb4..77d46aa8cdd 100644 --- a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc @@ -15,6 +15,8 @@ #include "librbd/exclusive_lock/Policy.h" #include "librbd/journal/Policy.h" #include "librbd/mirror/GetInfoRequest.h" + +#include // for std::shared_lock #include #define dout_context g_ceph_context diff --git a/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc b/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc index f5d49048e6d..7263e2d79cf 100644 --- a/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc +++ b/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc @@ -13,6 +13,8 @@ #include "librbd/journal/Types.h" #include +#include // for std::shared_lock + #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror diff --git a/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.cc b/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.cc index c8a96a4ad36..26fba303c03 100644 --- a/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.cc @@ -12,6 +12,8 @@ #include "tools/rbd_mirror/ProgressContext.h" #include "tools/rbd_mirror/image_replayer/journal/StateBuilder.h" +#include // for std::shared_lock + #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix diff --git a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc index 432e8d99698..d052536cc38 100644 --- a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc +++ b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc @@ -5,6 +5,7 @@ #include "common/debug.h" #include "common/errno.h" #include "common/perf_counters.h" +#include "common/perf_counters_collection.h" #include "common/perf_counters_key.h" #include "common/Timer.h" #include "librbd/Journal.h" @@ -23,6 +24,8 @@ #include "tools/rbd_mirror/image_replayer/journal/ReplayStatusFormatter.h" #include "tools/rbd_mirror/image_replayer/journal/StateBuilder.h" +#include // for std::shared_lock + #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc b/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc index 75881307cee..9bc9c18d84d 100644 --- a/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc @@ -12,6 +12,8 @@ #include "tools/rbd_mirror/image_replayer/snapshot/Utils.h" #include +#include // for std::shared_lock + #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc b/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc index 67eaa97779d..645c0616f8b 100644 --- a/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc +++ b/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc @@ -2,9 +2,11 @@ // vim: ts=8 sw=2 smarttab #include "Replayer.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/debug.h" #include "common/errno.h" #include "common/perf_counters.h" +#include "common/perf_counters_collection.h" #include "common/perf_counters_key.h" #include "include/stringify.h" #include "common/Timer.h" @@ -33,7 +35,9 @@ #include "tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.h" #include "tools/rbd_mirror/image_replayer/snapshot/StateBuilder.h" #include "tools/rbd_mirror/image_replayer/snapshot/Utils.h" + #include +#include // for std::shared_lock #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror diff --git a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc index d1cd32b39f3..630ea237457 100644 --- a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc @@ -8,7 +8,9 @@ #include "librbd/ImageState.h" #include "librbd/Operations.h" #include "librbd/Utils.h" + #include +#include // for std::shared_lock #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror diff --git a/src/tools/rbd_mirror/main.cc b/src/tools/rbd_mirror/main.cc index 85e95e6b6c3..0ae6039fbe7 100644 --- a/src/tools/rbd_mirror/main.cc +++ b/src/tools/rbd_mirror/main.cc @@ -6,6 +6,7 @@ #include "common/debug.h" #include "common/errno.h" #include "common/perf_counters.h" +#include "common/perf_counters_collection.h" #include "global/global_init.h" #include "global/signal_handler.h" #include "Mirror.h" diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index 325dbdb5246..68c6f545591 100644 --- a/src/tools/rbd_nbd/rbd-nbd.cc +++ b/src/tools/rbd_nbd/rbd-nbd.cc @@ -58,7 +58,7 @@ #include "common/TextTable.h" #include "common/ceph_argparse.h" #include "common/config.h" -#include "common/dout.h" +#include "common/debug.h" #include "common/errno.h" #include "common/event_socket.h" #include "common/module.h"