Merge pull request ceph#61696 from MaxKellermann/osd_includes

osd: include cleanup

Reviewed-by: Matan Breizman <[email protected]>

Author: tchaikov

src/include/object.h

@@ -17,8 +17,8 @@
 
 #include <cstdint>
 #include <cstdio>
-#include <iomanip>
-#include <iosfwd>
+#include <list>
+#include <ostream>
 #include <string>
 #include <string>
 #include <string_view>

src/osd/ECBackend.cc

@@ -12,17 +12,18 @@
  *
  */
 
+#include "ECBackend.h"
+
 #include <iostream>
-#include <sstream>
 
-#include "ECBackend.h"
 #include "ECInject.h"
 #include "messages/MOSDPGPush.h"
 #include "messages/MOSDPGPushReply.h"
 #include "messages/MOSDECSubOpWrite.h"
 #include "messages/MOSDECSubOpWriteReply.h"
 #include "messages/MOSDECSubOpRead.h"
 #include "messages/MOSDECSubOpReadReply.h"
+#include "common/debug.h"
 #include "ECMsgTypes.h"
 #include "ECTypes.h"
 #include "ECSwitch.h"

src/osd/ECCommon.cc

@@ -12,17 +12,19 @@
  *
  */
 
+#include "ECCommon.h"
+
 #include <iostream>
 #include <sstream>
 
-#include "ECCommon.h"
 #include "ECInject.h"
 #include "messages/MOSDPGPush.h"
 #include "messages/MOSDPGPushReply.h"
 #include "messages/MOSDECSubOpWrite.h"
 #include "messages/MOSDECSubOpWriteReply.h"
 #include "messages/MOSDECSubOpRead.h"
 #include "messages/MOSDECSubOpReadReply.h"
+#include "common/debug.h"
 #include "ECMsgTypes.h"
 #include "PGLog.h"
 

src/osd/ECCommon.h

@@ -14,7 +14,6 @@
 
 #pragma once
 
-#include <boost/intrusive/set.hpp>
 #include <boost/intrusive/list.hpp>
 #include <fmt/format.h>
 

src/osd/ECUtil.cc

@@ -1,10 +1,13 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 
+#include "ECUtil.h"
+
+#include <sstream>
+
 #include <errno.h>
 #include "common/ceph_context.h"
 #include "global/global_context.h"
 #include "include/encoding.h"
-#include "ECUtil.h"
 
 using namespace std;
 using ceph::bufferlist;

src/osd/ECUtil.h

@@ -14,7 +14,11 @@
 
 #pragma once
 
+#include <map>
 #include <ostream>
+#include <set>
+#include <string>
+
 #include "erasure-code/ErasureCodeInterface.h"
 #include "include/buffer_fwd.h"
 #include "include/ceph_assert.h"

src/osd/OSD.cc

@@ -13,10 +13,13 @@
  *
  */
 
+#include "OSD.h"
+
 #include "acconfig.h"
 
 #include <cctype>
 #include <fstream>
+#include <iomanip>
 #include <iostream>
 #include <iterator>
 
@@ -45,7 +48,6 @@
 #include "include/random.h"
 #include "include/scope_guard.h"
 
-#include "OSD.h"
 #include "OSDMap.h"
 #include "Watch.h"
 #include "osdc/Objecter.h"
@@ -54,6 +56,7 @@
 #include "common/ceph_argparse.h"
 #include "common/ceph_releases.h"
 #include "common/ceph_time.h"
+#include "common/debug.h"
 #include "common/version.h"
 #include "common/async/blocked_completion.h"
 #include "common/pick_address.h"
@@ -124,6 +127,7 @@
 #include "global/pidfile.h"
 
 #include "include/color.h"
+#include "log/Log.h"
 #include "perfglue/cpu_profiler.h"
 #include "perfglue/heap_profiler.h"
 

src/osd/OSDMap.cc

@@ -15,15 +15,19 @@
  *
  */
 
+#include "OSDMap.h"
+
 #include <algorithm>
 #include <bit>
+#include <iomanip>
 #include <optional>
 #include <random>
+#include <sstream>
 #include <fmt/format.h>
 
 #include <boost/algorithm/string.hpp>
 
-#include "OSDMap.h"
+#include "common/ceph_context.h"
 #include "common/config.h"
 #include "common/errno.h"
 #include "common/Formatter.h"

src/osd/OSDMap.h

@@ -29,17 +29,21 @@
 #include <set>
 #include <map>
 #include <memory>
+#include <random>
 
-#include <boost/smart_ptr/local_shared_ptr.hpp>
 #include "include/btree_map.h"
 #include "include/common_fwd.h"
+#include "include/fs_types.h" // for struct file_layout_t
 #include "include/types.h"
 #include "common/ceph_releases.h"
 #include "osd_types.h"
 
-//#include "include/ceph_features.h"
 #include "crush/CrushWrapper.h"
 
+#ifdef WITH_SEASTAR
+#include <boost/smart_ptr/local_shared_ptr.hpp>
+#endif
+
 // forward declaration
 class CrushWrapper;
 class health_check_map_t;

src/osd/OSDMapMapping.cc

@@ -7,6 +7,7 @@
 #define dout_subsys ceph_subsys_mon
 
 #include "common/debug.h"
+#include "crush/crush.h" // for CRUSH_ITEM_NONE
 
 using std::vector;