tools: add missing includes

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/tools/ceph_authtool.cc b/src/tools/ceph_authtool.cc
index bf0bd5523ecf58e57325cfb8204ef3f57d017bc6..da7957c9d2c6b006d00584f5a5a848e860260020 100644 (file)
--- 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 1d1fc1f7725c54cb737c7fb983ee72df54bb312c..700a7fc46bf2f5de57f475313c79a2290f4e773f 100644 (file)
--- 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 9b5dd8bee77757159174eb5d8ddc04109317fa28..dd9646493d6a6fd17889339557c9a527ac6805a5 100644 (file)
--- 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 <shared_mutex> // 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 c35c4c1facb1a006a4c94e7052e0fe8d5e080152..2d37514cdfabfb73c22a6f2f52fda18e4e5cde30 100644 (file)
--- 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 <boost/optional.hpp>
 
 struct EstimateResult {
   std::unique_ptr<CDC> cdc;

diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc
index bcb90c8fe4639d0e7eefffad3609cc3eb4fdf5e9..738fdedf6b421e323cd3cb85767957711ea99f69 100644 (file)
--- 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 a7f6e2732583dd263dd0548ea5b9f491f2205a11..9b880c4d360180927a64f7311ccc52b79b30906a 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -17,6 +17,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/optional.hpp>
+#include <iomanip>
 #include <fstream>
 
 #include <stdlib.h>
@@ -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 281af410c2a960c46ad03542df82b44665bbf4bb..bdc02ed481f6530498be9a9f15fd42cc8d8c34ec 100644 (file)
--- 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 <fstream>
@@ -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 4b8f34bf69a2998bb21659fafe23c35af029fe43..aea9b5242ee2d7fff2b9f41c58a91498793f22bb 100644 (file)
--- 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 9393ef9d9756bf4db4ece3635c2438353515f5de..772fb71c585cbc243f0a92d2c37f50f206a5b5af 100644 (file)
--- 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 3a5e781a2db68da74a140b84d69d190c88819c18..3818099851d18212aab9cebfbad0b96f95b874bf 100644 (file)
--- 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 e72542fd4a0b2a3565ba7670305b35bf4baa920f..602419349c6eafa94a876a46d2e30df3d9720651 100644 (file)
--- 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 b204cbef1b07a537d32bc64211944ba400646aee..e34163fd6af665c2a1c39bc6ed23344bbf4667e1 100644 (file)
--- a/src/tools/cephfs/JournalTool.cc
+++ b/src/tools/cephfs/JournalTool.cc
@@ -15,6 +15,7 @@
 #include <sstream>
 
 #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 54386d2199f90a964119933b2a59481eb968f1f6..d554d4724c26aff3ff0056fd7c83669ecf364ac9 100644 (file)
--- 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 f80baa2f83bae772565cdd04905706d427a72501..d0d131ef9a0fcf37c9122d7553fa8b37e97dc63b 100644 (file)
--- 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 2abca722335040c9ce530d409b11dac3ef00a12b..1bf7885aa9f20cd98c6b7275de1fc6181112515e 100644 (file)
--- 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 151a2e22e44128a8e1507a9547048b5af339774a..92996fd968507adc4154b1b9d8a942b936d54fff 100644 (file)
--- a/src/tools/cephfs/Resetter.cc
+++ b/src/tools/cephfs/Resetter.cc
@@ -11,7 +11,11 @@
  * Foundation.  See file COPYING.
  * 
  */
+
+#include "Resetter.h"
+
 #include <memory>
+#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 e8f9d7f12d7aee5330210bbe9a1bcf59e33d227d..a270f9aa2e900e5783e2674c027a0e4c51b656fb 100644 (file)
--- 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 78fc5965823c57dd6a7fb55322884407a3f2401e..c07828f364e9d939d8364c21478e97ab0407b997 100644 (file)
--- 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 ea1857b1eba86d9b0ba329ba14cc406012ee34bb..2b181c97255ba973a5abf24ddc5148e4b0faed5a 100644 (file)
--- 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 397adb4f8c0572cf89344e6ad674c32ea75f1654..004242430a44621b136019156462bd98b8cfe21d 100644 (file)
--- 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 77e93ef6a9935d6dc86d38221585ab53db6cadf0..535cd49cc75398f6b3f2740c8b80cfe1dbf9da31 100644 (file)
--- 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 32c71301f00686fd78cf5f56a254481defe78aeb..cd948b8300e0836a87380035bcfae059648652d8 100644 (file)
--- 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 <boost/optional.hpp>
+
 namespace cephfs {
 namespace mirror {
 

diff --git a/src/tools/cephfs_mirror/ServiceDaemon.cc b/src/tools/cephfs_mirror/ServiceDaemon.cc
index f66dd46bf7fc693bcef20a8b3f0ba8ecc38f8101..c19e121beae648ab9e165372da45acc18c125355 100644 (file)
--- 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 fda9bdca4ebb4e82c2d4202780821ca5e76d1687..ac52552a638f2d3775d28bf78488559a42096b06 100644 (file)
--- 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 <boost/variant/variant.hpp>
+
 namespace cephfs {
 namespace mirror {
 

diff --git a/src/tools/cephfs_mirror/main.cc b/src/tools/cephfs_mirror/main.cc
index 4abb895a007d7ebcb74a9eb8f228dd0f7108a999..93d3e018d81e7a1e745ef94be3525bf6ed118e46 100644 (file)
--- 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 acfc9a3c6f76824eb3484319e9f19af5e4bed860..a1a55422bf47c0dbb50005840cceecf46a571699 100644 (file)
--- 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 3a7375ba97626acf78b6d66f33cbc188934d72d7..b208ba5008b8bf2ebeb1ab1d8307d0e5afb07090 100644 (file)
--- 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 <shared_mutex> // 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 720d1150650e5987378fc0c348105fa3d9037a0f..997180d970650f591f99bb0219aff35130733214 100644 (file)
--- a/src/tools/kvstore_tool.cc
+++ b/src/tools/kvstore_tool.cc
@@ -5,13 +5,19 @@
 
 #include <iostream>
 
+#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 a0b906e96588a74bd69cf6fe4777871e4ebfaa15..02e6462788269d9d1c3824685a4bc5b85442764d 100644 (file)
--- 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 dc882a006a21b278cedc09d93f0c40fd971d2843..1e9b41e436d6e214b6806ef8b86b84fb05275359 100644 (file)
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -14,8 +14,11 @@
 #include <string>
 
 #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 56e86c845911413a413473c24744cdfbf72404e7..b1e594d14f4e73f4f0c9d4384a7fa65c1b0c7f6a 100644 (file)
--- 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 <time.h>

diff --git a/src/tools/rados/PoolDump.cc b/src/tools/rados/PoolDump.cc
index 9f51a1391631cb233a1e9f32591a52583d0dd025..df380afc89f827a1a1a9f37a306e56ccae1122c8 100644 (file)
--- 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 0b27c077b214c31b7b2b88c8e0021306c1e5aec3..cb554488598232e529d6a9857be5f4d5d45fef3e 100644 (file)
--- 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 9dfe9d36c0c95673e17cf92eabb5d4041e12ba30..fb7255684093af45fd7af9e33e03878f756c9c0f 100644 (file)
--- 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 <boost/optional.hpp>
+
+#include <iomanip>
+
 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 b20dca05bc64e68867026f23dbbe18e94491df85..bad7d5bdefef99a787e92a270fbd15298d544505 100644 (file)
--- 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 <fstream>

diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc
index 6a546c3f73a34a6c64bbeb421035b63666b7338a..9c08afed35c66f053de8fa57abe4adbd642a1f0c 100644 (file)
--- 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 788162c66264af077351d7969e05075849c60b97..8330a4145136caa2603927ae54cd6938d9e47e8c 100644 (file)
--- a/src/tools/rbd/action/Perf.cc
+++ b/src/tools/rbd/action/Perf.cc
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <iomanip>
 #include <iostream>
 #include <vector>
 #include <boost/algorithm/string.hpp>

diff --git a/src/tools/rbd/action/Pool.cc b/src/tools/rbd/action/Pool.cc
index 2ad8e17ff8e2488c25ac8076114517c512fd1f36..13970a01d3c7417f86622d65e26fc988d013cc2b 100644 (file)
--- 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 <iostream>

diff --git a/src/tools/rbd_mirror/ImageMap.h b/src/tools/rbd_mirror/ImageMap.h
index 011d73c94f98651c688b73559d158e4776dc50e1..b17437b77069b0f6adbfbee4d6a0646136d01dff 100644 (file)
--- a/src/tools/rbd_mirror/ImageMap.h
+++ b/src/tools/rbd_mirror/ImageMap.h
@@ -7,6 +7,7 @@
 #include <vector>
 
 #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 438e3c11d0641242e96c74c33e178f6c3762b1f7..6c3553dd9415d08d784072fa838c8c17e0ca052b 100644 (file)
--- 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 <map>
+#include <shared_mutex> // for std::shared_lock
+
+#include <boost/optional/optional_io.hpp>
 
 #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 43d0c666338657b7155cde475058aa6c808c66b8..b0434bef6c5ac6f05464407835df810c5dee1b77 100644 (file)
--- 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 <shared_mutex> // 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 19a98804c71a9841fa70d4cb57a70f6070019070..440d1598baf415fe05cb80813e67701b1e210678 100644 (file)
--- 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 <shared_mutex> // 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 62fbd12dc0bc8df4f83396815932572dc79134c2..88f4f2695496a9a5191dc159306364a2e837e53c 100644 (file)
--- 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 <shared_mutex> // 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 b256e2f1d8ff16ed23b60bd60c7ededbd4b27d1e..79e825ec193fa474216de1666b89d5db04eccc6b 100644 (file)
--- 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 <map>
+#include <set>
+#include <string>
 #include <tuple>
 #include <boost/optional.hpp>
 
 #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 641bb03e80f8c9b3792f1ba39f2643294405e703..96717b4edfd989aa464af15a663d9b0a4f8a6b3b 100644 (file)
--- 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 <boost/algorithm/string/predicate.hpp>
 
+#include <shared_mutex> // 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 7f8d9608eb4d899f84c81bdad3eef33c3c9df277..77d46aa8cddb98a7b49751c893e6ae28b1dd5245 100644 (file)
--- 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 <shared_mutex> // for std::shared_lock
 #include <type_traits>
 
 #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 f5d49048e6d4e2ea2714901313ff4afe66fae90c..7263e2d79cff0ca7221aecd6fda4b2623197656e 100644 (file)
--- 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 <boost/variant.hpp>
 
+#include <shared_mutex> // 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 c8a96a4ad364c7d1fa4607f091e480b61ce83ff6..26fba303c035da34edb378e4621e73f7edbd7be8 100644 (file)
--- 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 <shared_mutex> // 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 432e8d99698b0e4d056c6fa6932dc460e6346029..d052536cc388546851b6710b132e1a75c791a100 100644 (file)
--- 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 <shared_mutex> // 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 75881307cee5ca0b0ee1c7381784db1e371c7f7d..9bc9c18d84dcd6d330c2029dcdde26e7b1d86059 100644 (file)
--- 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 <boost/algorithm/string/predicate.hpp>
 
+#include <shared_mutex> // 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 67eaa97779d7ef83cf374fa5d055ef634e393c4e..645c0616f8bce8e3035592dc983a70de0f80f3f0 100644 (file)
--- 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 <set>
+#include <shared_mutex> // 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 d1cd32b39f35911ad8f23d00b2d25de1e697cbec..630ea237457db1c5914f90b326cc374269148d64 100644 (file)
--- 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 <set>
+#include <shared_mutex> // 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 85e95e6b6c3c1e8d68ec74eb5588c5d0aa541ee1..0ae6039fbe7a258c8846bab3c9ddb95333a563a8 100644 (file)
--- 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 325dbdb5246bc3dcc8f31aaf8bc44b642c4a9715..68c6f5455917ad1ec0dfe7972fc50f58fa006d70 100644 (file)
--- 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"