rgw: add missing includes

MaxKellermann · MaxKellermann · commit f5ff6b95b9d4 · 2025-02-07T12:53:23.000+01:00
Signed-off-by: Max Kellermann &lt;max.kellermann@ionos.com&gt;
diff --git a/src/rgw/driver/dbstore/common/dbstore.cc b/src/rgw/driver/dbstore/common/dbstore.cc
@@ -2,6 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "dbstore.h"
+#include "log/Log.h"
 
 using namespace std;
 
diff --git a/src/rgw/driver/dbstore/dbstore_mgr.h b/src/rgw/driver/dbstore/dbstore_mgr.h
@@ -13,6 +13,7 @@
 
 #include "common/ceph_context.h"
 #include "common/dbstore.h"
+#include "log/Log.h"
 #include "sqlite/sqliteDB.h"
 
 using namespace rgw::store;
diff --git a/src/rgw/driver/dbstore/tests/dbstore_tests.cc b/src/rgw/driver/dbstore/tests/dbstore_tests.cc
@@ -7,6 +7,7 @@
 #include <dbstore.h>
 #include <sqliteDB.h>
 #include "rgw_common.h"
+#include "common/Clock.h" // for ceph_clock_now()
 
 using namespace std;
 using DB = rgw::store::DB;
diff --git a/src/rgw/driver/posix/rgw_sal_posix.cc b/src/rgw/driver/posix/rgw_sal_posix.cc
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include "rgw_multi.h"
 #include "include/scope_guard.h"
+#include "common/Clock.h" // for ceph_clock_now()
 #include "common/errno.h"
 
 #define dout_subsys ceph_subsys_rgw
diff --git a/src/rgw/driver/rados/cls_fifo_legacy.cc b/src/rgw/driver/rados/cls_fifo_legacy.cc
@@ -27,6 +27,7 @@
 
 #include "common/async/yield_context.h"
 #include "common/random_string.h"
+#include "common/strtol.h" // for ceph::parse()
 
 #include "cls/fifo/cls_fifo_types.h"
 #include "cls/fifo/cls_fifo_ops.h"
diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc
@@ -1,6 +1,8 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
+#include "rgw_data_sync.h"
+
 #include "common/ceph_json.h"
 #include "common/RefCountedObj.h"
 #include "common/WorkQueue.h"
@@ -10,7 +12,6 @@
 #include "rgw_common.h"
 #include "rgw_zone.h"
 #include "rgw_sync.h"
-#include "rgw_data_sync.h"
 #include "rgw_rest_conn.h"
 #include "rgw_cr_rados.h"
 #include "rgw_cr_rest.h"
@@ -34,8 +35,10 @@
 
 #include "include/common_fwd.h"
 #include "include/random.h"
+#include "include/timegm.h"
 
 #include <boost/asio/yield.hpp>
+#include <shared_mutex> // for std::shared_lock
 #include <string_view>
 
 #define dout_subsys ceph_subsys_rgw
diff --git a/src/rgw/driver/rados/rgw_datalog.cc b/src/rgw/driver/rados/rgw_datalog.cc
@@ -1,6 +1,7 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
+#include <shared_mutex> // for std::shared_lock
 #include <vector>
 
 #include "common/async/yield_context.h"
diff --git a/src/rgw/driver/rados/rgw_pubsub_push.cc b/src/rgw/driver/rados/rgw_pubsub_push.cc
@@ -2,6 +2,7 @@
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 #include "rgw_pubsub_push.h"
+#include <shared_mutex> // for std::shared_lock
 #include <string>
 #include <sstream>
 #include <algorithm>
diff --git a/src/rgw/driver/rados/rgw_reshard.cc b/src/rgw/driver/rados/rgw_reshard.cc
@@ -13,6 +13,7 @@
 #include "rgw_sal_rados.h"
 #include "cls/rgw/cls_rgw_client.h"
 #include "cls/lock/cls_lock_client.h"
+#include "common/Clock.h" // for ceph_clock_now()
 #include "common/errno.h"
 #include "common/ceph_json.h"
 
diff --git a/src/rgw/radosgw-admin/radosgw-admin.cc b/src/rgw/radosgw-admin/radosgw-admin.cc
@@ -85,6 +85,8 @@ extern "C" {
 #include "driver/rados/rgw_bucket.h"
 #include "driver/rados/rgw_sal_rados.h"
 
+#include <iomanip>
+
 #define dout_context g_ceph_context
 
 static rgw::sal::Driver* driver = NULL;
diff --git a/src/rgw/rgw_amqp.cc b/src/rgw/rgw_amqp.cc
@@ -15,8 +15,10 @@
 #include <thread>
 #include <atomic>
 #include <mutex>
+#include <shared_mutex> // for std::shared_lock
 #include <boost/lockfree/queue.hpp>
 #include <boost/functional/hash.hpp>
+#include "common/Clock.h" // for ceph_clock_now()
 #include "common/dout.h"
 #include <openssl/ssl.h>
 
diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
@@ -3,6 +3,7 @@
 
 #include <atomic>
 #include <ctime>
+#include <iomanip>
 #include <list>
 #include <memory>
 
diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc
@@ -12,6 +12,7 @@
 #include "common/armor.h"
 #include "common/utf8.h"
 #include "common/split.h"
+#include "include/timegm.h"
 #include "rgw_rest_s3.h"
 #include "rgw_auth_s3.h"
 #include "rgw_common.h"
diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <shared_mutex> // for std::shared_lock
 #include <string>
 #include <map>
 #include <unordered_map>
diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
@@ -28,6 +28,7 @@
 #include "common/convenience.h"
 #include "common/strtol.h"
 #include "include/str_list.h"
+#include "include/timegm.h"
 #include "rgw_crypt_sanitize.h"
 #include "rgw_bucket_sync.h"
 #include "rgw_sync_policy.h"
diff --git a/src/rgw/rgw_coroutine.cc b/src/rgw/rgw_coroutine.cc
@@ -3,6 +3,7 @@
 
 #include "include/Context.h"
 #include "common/ceph_json.h"
+#include "common/Clock.h" // for ceph_clock_now()
 #include "rgw_coroutine.h"
 #include "rgw_asio_thread.h"
 
@@ -11,6 +12,8 @@
 
 #include <boost/asio/yield.hpp>
 
+#include <shared_mutex> // for std::shared_lock
+
 #define dout_subsys ceph_subsys_rgw
 #define dout_context g_ceph_context
 
diff --git a/src/rgw/rgw_dmclock_scheduler_ctx.h b/src/rgw/rgw_dmclock_scheduler_ctx.h
@@ -8,6 +8,12 @@
 #include "common/config.h"
 #include "rgw_dmclock.h"
 
+#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#include "crimson/common/perf_counters_collection.h"
+#else
+#include "common/perf_counters_collection.h"
+#endif
+
 namespace queue_counters {
 
   enum {
diff --git a/src/rgw/rgw_dmclock_sync_scheduler.cc b/src/rgw/rgw_dmclock_sync_scheduler.cc
@@ -5,6 +5,12 @@
 #include "rgw_dmclock_sync_scheduler.h"
 #include "rgw_dmclock_scheduler_ctx.h"
 
+#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#include "crimson/common/perf_counters_collection.h"
+#else
+#include "common/perf_counters_collection.h"
+#endif
+
 namespace rgw::dmclock {
 
 SyncScheduler::~SyncScheduler()
diff --git a/src/rgw/rgw_es_query.cc b/src/rgw/rgw_es_query.cc
@@ -8,6 +8,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "common/ceph_json.h"
+#include "common/strtol.h"
 #include "rgw_common.h"
 #include "rgw_es_query.h"
 
diff --git a/src/rgw/rgw_kafka.cc b/src/rgw/rgw_kafka.cc
@@ -10,13 +10,16 @@
 #include <unordered_map>
 #include <string>
 #include <vector>
+#include <shared_mutex> // for std::shared_lock
 #include <thread>
 #include <atomic>
 #include <mutex>
 #include <boost/algorithm/string.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/lockfree/queue.hpp>
+#include "common/Clock.h" // for ceph_clock_now()
 #include "common/dout.h"
+#include "include/utime.h"
 
 #define dout_subsys ceph_subsys_rgw_notification
 
diff --git a/src/rgw/rgw_keystone.cc b/src/rgw/rgw_keystone.cc
@@ -10,6 +10,7 @@
 
 #include "common/errno.h"
 #include "common/ceph_json.h"
+#include "include/timegm.h"
 #include "include/types.h"
 #include "include/str_list.h"
 
diff --git a/src/rgw/rgw_period_pusher.h b/src/rgw/rgw_period_pusher.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "common/async/yield_context.h"
+#include "include/types.h" // for epoch_t
 #include "rgw_realm_reloader.h"
 #include "rgw_sal_fwd.h"
 
diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc
@@ -1,10 +1,13 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
+#include "rgw_policy_s3.h"
+
 #include <errno.h>
 
 #include "common/ceph_json.h"
-#include "rgw_policy_s3.h"
+#include "common/Clock.h" // for ceph_clock_now()
+#include "include/timegm.h"
 #include "rgw_common.h"
 #include "rgw_crypt_sanitize.h"
 #include "rgw_cksum.h"
diff --git a/src/rgw/rgw_quota.cc b/src/rgw/rgw_quota.cc
@@ -16,6 +16,7 @@
 
 #include "include/function2.hpp"
 #include "include/utime.h"
+#include "common/Clock.h" // for ceph_clock_now()
 #include "common/lru_map.h"
 #include "common/RefCountedObj.h"
 #include "common/Thread.h"
diff --git a/src/rgw/rgw_ratelimit.h b/src/rgw/rgw_ratelimit.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <chrono>
+#include <shared_mutex> // for std::shared_lock
 #include <thread>
 #include <condition_variable>
 #include "rgw_common.h"
diff --git a/src/rgw/rgw_rest_sts.cc b/src/rgw/rgw_rest_sts.cc
@@ -3,6 +3,7 @@
 #include <vector>
 #include <string>
 #include <array>
+#include <iomanip>
 #include <string_view>
 #include <sstream>
 #include <memory>
diff --git a/src/rgw/rgw_swift_auth.cc b/src/rgw/rgw_swift_auth.cc
@@ -16,6 +16,7 @@
 #include "common/Clock.h"
 
 #include "include/random.h"
+#include "include/timegm.h"
 
 #include "rgw_client_io.h"
 #include "rgw_http_client.h"
diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc
@@ -4,6 +4,7 @@
 #include <errno.h>
 
 #include "common/errno.h"
+#include "common/safe_io.h" // for safe_read()
 
 #include "rgw_tools.h"
 
diff --git a/src/rgw/services/svc_notify.cc b/src/rgw/services/svc_notify.cc
@@ -12,6 +12,8 @@
 
 #include "rgw_zone.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 #define dout_subsys ceph_subsys_rgw
 
 using namespace std;
diff --git a/src/rgw/services/svc_sys_obj_cache.h b/src/rgw/services/svc_sys_obj_cache.h
@@ -9,6 +9,8 @@
 
 #include "svc_sys_obj_core.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 class RGWSI_Notify;
 
 class RGWSI_SysObj_Cache_CB;
