From f5ff6b95b9d4fb5e3c96228fd41f37122c160f63 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 26 Oct 2024 20:15:29 +0200 Subject: [PATCH] rgw: add missing includes Signed-off-by: Max Kellermann --- src/rgw/driver/dbstore/common/dbstore.cc | 1 + src/rgw/driver/dbstore/dbstore_mgr.h | 1 + src/rgw/driver/dbstore/tests/dbstore_tests.cc | 1 + src/rgw/driver/posix/rgw_sal_posix.cc | 1 + src/rgw/driver/rados/cls_fifo_legacy.cc | 1 + src/rgw/driver/rados/rgw_data_sync.cc | 5 ++++- src/rgw/driver/rados/rgw_datalog.cc | 1 + src/rgw/driver/rados/rgw_pubsub_push.cc | 1 + src/rgw/driver/rados/rgw_reshard.cc | 1 + src/rgw/radosgw-admin/radosgw-admin.cc | 2 ++ src/rgw/rgw_amqp.cc | 2 ++ src/rgw/rgw_asio_frontend.cc | 1 + src/rgw/rgw_auth_s3.cc | 1 + src/rgw/rgw_cache.h | 1 + src/rgw/rgw_common.cc | 1 + src/rgw/rgw_coroutine.cc | 3 +++ src/rgw/rgw_dmclock_scheduler_ctx.h | 6 ++++++ src/rgw/rgw_dmclock_sync_scheduler.cc | 6 ++++++ src/rgw/rgw_es_query.cc | 1 + src/rgw/rgw_kafka.cc | 3 +++ src/rgw/rgw_keystone.cc | 1 + src/rgw/rgw_period_pusher.h | 1 + src/rgw/rgw_policy_s3.cc | 5 ++++- src/rgw/rgw_quota.cc | 1 + src/rgw/rgw_ratelimit.h | 1 + src/rgw/rgw_rest_sts.cc | 1 + src/rgw/rgw_swift_auth.cc | 1 + src/rgw/rgw_tools.cc | 1 + src/rgw/services/svc_notify.cc | 2 ++ src/rgw/services/svc_sys_obj_cache.h | 2 ++ 30 files changed, 54 insertions(+), 2 deletions(-) diff --git a/src/rgw/driver/dbstore/common/dbstore.cc b/src/rgw/driver/dbstore/common/dbstore.cc index 8727d40eda65b..ccd643c851b82 100644 --- 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 index 77fc3aaf731fb..9e14ea19457f7 100644 --- 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 index 554c4d29382a5..9f47aee4e1239 100644 --- a/src/rgw/driver/dbstore/tests/dbstore_tests.cc +++ b/src/rgw/driver/dbstore/tests/dbstore_tests.cc @@ -7,6 +7,7 @@ #include #include #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 index 129be22b63283..8879056bb20af 100644 --- a/src/rgw/driver/posix/rgw_sal_posix.cc +++ b/src/rgw/driver/posix/rgw_sal_posix.cc @@ -20,6 +20,7 @@ #include #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 index 7e614adae6766..aa67bf8a82034 100644 --- 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 index 1302f278f590d..177d07d37e455 100644 --- 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 +#include // for std::shared_lock #include #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/driver/rados/rgw_datalog.cc b/src/rgw/driver/rados/rgw_datalog.cc index d7e57d7e1c15d..8b384da0f8ee5 100644 --- 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 // for std::shared_lock #include #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 index d22c61e9b0857..3041e3a932cf6 100644 --- 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 // for std::shared_lock #include #include #include diff --git a/src/rgw/driver/rados/rgw_reshard.cc b/src/rgw/driver/rados/rgw_reshard.cc index 23a7f5f02addf..ac06f76143bb9 100644 --- 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 index 2c14e61506ab3..8e995206e9b8e 100644 --- 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 + #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 index 5bc5d173c73a2..06688fdacc917 100644 --- a/src/rgw/rgw_amqp.cc +++ b/src/rgw/rgw_amqp.cc @@ -15,8 +15,10 @@ #include #include #include +#include // for std::shared_lock #include #include +#include "common/Clock.h" // for ceph_clock_now() #include "common/dout.h" #include diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc index 2330eb41fdec6..a76aebccfd06e 100644 --- a/src/rgw/rgw_asio_frontend.cc +++ b/src/rgw/rgw_asio_frontend.cc @@ -3,6 +3,7 @@ #include #include +#include #include #include diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc index 5f2d400b188b1..17bbe2b8a3c37 100644 --- 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 index e70beb0644620..1ada720203d54 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -3,6 +3,7 @@ #pragma once +#include // for std::shared_lock #include #include #include diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index 5140ed4e9cf80..77ed3bbc9d080 100644 --- 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 index 3b789b8b8591e..3fbc9b601b005 100644 --- 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 +#include // 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 index f27b81c266e55..031c5a0888110 100644 --- 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 index 06857202f3121..918b70ffc3973 100644 --- 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 index 16105d599c513..93db0e2ec9dcb 100644 --- a/src/rgw/rgw_es_query.cc +++ b/src/rgw/rgw_es_query.cc @@ -8,6 +8,7 @@ #include #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 index b38b1a78ec476..2b6822706b040 100644 --- a/src/rgw/rgw_kafka.cc +++ b/src/rgw/rgw_kafka.cc @@ -10,13 +10,16 @@ #include #include #include +#include // for std::shared_lock #include #include #include #include #include #include +#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 index 3b78b642cc78a..2767cea06def1 100644 --- 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 index 3ea7bd7ddebe0..c7c76e4dd5ed9 100644 --- a/src/rgw/rgw_period_pusher.h +++ b/src/rgw/rgw_period_pusher.h @@ -8,6 +8,7 @@ #include #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 index 1c183644b30af..7b8ad0452cbc5 100644 --- 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 #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 index 063557c8e7e49..70bded92ee06d 100644 --- 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 index beb0eb3b1d243..224312bb0d78f 100644 --- a/src/rgw/rgw_ratelimit.h +++ b/src/rgw/rgw_ratelimit.h @@ -1,5 +1,6 @@ #pragma once #include +#include // for std::shared_lock #include #include #include "rgw_common.h" diff --git a/src/rgw/rgw_rest_sts.cc b/src/rgw/rgw_rest_sts.cc index 1101da0af3cca..c0c6b5e89acd2 100644 --- a/src/rgw/rgw_rest_sts.cc +++ b/src/rgw/rgw_rest_sts.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/src/rgw/rgw_swift_auth.cc b/src/rgw/rgw_swift_auth.cc index 937f74601b362..febad481b5148 100644 --- 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 index 7e6513cde4dda..220992a92f46c 100644 --- a/src/rgw/rgw_tools.cc +++ b/src/rgw/rgw_tools.cc @@ -4,6 +4,7 @@ #include #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 index 5593dee9ae291..1ad6059a96215 100644 --- a/src/rgw/services/svc_notify.cc +++ b/src/rgw/services/svc_notify.cc @@ -12,6 +12,8 @@ #include "rgw_zone.h" +#include // 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 index 8e2f5845dc12f..9d0b14c51301c 100644 --- 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 // for std::shared_lock + class RGWSI_Notify; class RGWSI_SysObj_Cache_CB; -- 2.39.5