Merge pull request ceph#61695 from MaxKellermann/tools_includes

idryomov · web-flow · commit dae433cea29f · 2025-02-12T09:40:13.000+01:00
tools: add missing includes

Reviewed-by: Patrick Donnelly &lt;pdonnell@ibm.com&gt;
Reviewed-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,13 +17,15 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/optional.hpp>
+#include <iomanip>
 #include <fstream>
 
 #include <stdlib.h>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/tools/rbd/action/Pool.cc b/src/tools/rbd/action/Pool.cc
diff --git a/src/tools/rbd_mirror/ImageMap.h b/src/tools/rbd_mirror/ImageMap.h
diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
diff --git a/src/tools/rbd_mirror/ImageSync.cc b/src/tools/rbd_mirror/ImageSync.cc
diff --git a/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc b/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc
diff --git a/src/tools/rbd_mirror/image_map/Policy.cc b/src/tools/rbd_mirror/image_map/Policy.cc
diff --git a/src/tools/rbd_mirror/image_map/Policy.h b/src/tools/rbd_mirror/image_map/Policy.h
diff --git a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
diff --git a/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc b/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc
diff --git a/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.cc b/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.cc
diff --git a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc
diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc b/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc
diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc b/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
diff --git a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc
diff --git a/src/tools/rbd_mirror/main.cc b/src/tools/rbd_mirror/main.cc
diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
