From: Matan Breizman Date: Sun, 9 Feb 2025 14:50:53 +0000 (+0000) Subject: crimson: bump up seastar fixes X-Git-Tag: v20.0.0~1^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=25a16116f07f963e23a4881c23e72ad3e101e443;p=ceph.git crimson: bump up seastar fixes Signed-off-by: Matan Breizman --- diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc index 12b006fee9e53..761d5ef50a922 100644 --- a/src/crimson/admin/osd_admin.cc +++ b/src/crimson/admin/osd_admin.cc @@ -343,7 +343,7 @@ public: for (const auto& [labels, metric] : metric_family) { if (metric && metric->is_enabled()) { f->open_object_section(""); // enclosed by array - DumpMetricsHook::dump_metric_value(f, full_name, *metric, labels); + DumpMetricsHook::dump_metric_value(f, full_name, *metric, labels.labels()); f->close_section(); } } diff --git a/src/crimson/common/config_proxy.h b/src/crimson/common/config_proxy.h index b04fbee2e8a75..fce86f2389cb1 100644 --- a/src/crimson/common/config_proxy.h +++ b/src/crimson/common/config_proxy.h @@ -73,7 +73,7 @@ class ConfigProxy : public seastar::peering_sharded_service (*obs)->handle_conf_change(owner, keys); } - return seastar::parallel_for_each(boost::irange(1u, seastar::smp::count), + return seastar::parallel_for_each(std::views::iota(1u, seastar::smp::count), [&owner, new_values] (auto cpu) { return owner.container().invoke_on(cpu, [foreign_values = seastar::make_foreign(new_values)](ConfigProxy& proxy) mutable { diff --git a/src/crimson/common/errorator-loop.h b/src/crimson/common/errorator-loop.h index bb3b7fb15c60c..f53361bea653d 100644 --- a/src/crimson/common/errorator-loop.h +++ b/src/crimson/common/errorator-loop.h @@ -70,9 +70,8 @@ parallel_for_each(Iterator first, Iterator last, Func&& func) noexcept { auto f = seastar::futurize_invoke(std::forward(func), *first); if (!f.available() || f.failed()) { if (!s) { - using itraits = std::iterator_traits; auto n = (seastar::internal::iterator_range_estimate_vector_capacity( - first, last, typename itraits::iterator_category()) + 1); + first, last) + 1); s = new parallel_for_each_state(n); } s->add_future(std::move(f)); diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h index 01fe1b192c435..a3cdacbc6d661 100644 --- a/src/crimson/common/interruptible_future.h +++ b/src/crimson/common/interruptible_future.h @@ -1403,9 +1403,8 @@ public: auto f = seastar::futurize_invoke(decorated_func, *begin++); if (!f.available() || f.failed()) { if (!s) { - using itraits = std::iterator_traits; auto n = (seastar::internal::iterator_range_estimate_vector_capacity( - begin, end, typename itraits::iterator_category()) + 1); + begin, end) + 1); s = new parallel_for_each_state(n); } s->add_future(std::move(f)); diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index 0bfd3e2266b04..2173aa4bb8c80 100644 --- a/src/crimson/osd/main.cc +++ b/src/crimson/osd/main.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include "auth/KeyRing.h" #include "common/ceph_argparse.h" @@ -161,7 +162,7 @@ int main(int argc, const char* argv[]) } // just ignore SIGHUP, we don't reread settings. keep in mind signals // handled by S* must be blocked for alien threads (see AlienStore). - seastar::engine().handle_signal(SIGHUP, [] {}); + seastar::handle_signal(SIGHUP, [] {}); // start prometheus API server seastar::httpd::http_server_control prom_server; diff --git a/src/crimson/osd/main_config_bootstrap_helpers.cc b/src/crimson/osd/main_config_bootstrap_helpers.cc index e4920eb870f38..0093f6cff765d 100644 --- a/src/crimson/osd/main_config_bootstrap_helpers.cc +++ b/src/crimson/osd/main_config_bootstrap_helpers.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "common/ceph_argparse.h" #include "common/config_tracker.h" diff --git a/src/crimson/osd/osd_operations/pg_advance_map.cc b/src/crimson/osd/osd_operations/pg_advance_map.cc index abfd56a7d7b59..c8fa56adb1a8b 100644 --- a/src/crimson/osd/osd_operations/pg_advance_map.cc +++ b/src/crimson/osd/osd_operations/pg_advance_map.cc @@ -10,6 +10,7 @@ #include "crimson/osd/shard_services.h" #include "crimson/osd/osd_operations/pg_advance_map.h" #include "crimson/osd/osd_operation_external_tracking.h" +#include #include "osd/PeeringState.h" namespace { diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc index cf78fb3e34d48..517cf6580bd34 100644 --- a/src/crimson/osd/shard_services.cc +++ b/src/crimson/osd/shard_services.cc @@ -23,6 +23,7 @@ #include "crimson/osd/osd_operations/pg_advance_map.h" #include "crimson/osd/pg.h" #include "crimson/osd/pg_meta.h" +#include SET_SUBSYS(osd); diff --git a/src/crimson/osd/stop_signal.h b/src/crimson/osd/stop_signal.h index 951f8d4b7fcfe..385dfbbcfa7af 100644 --- a/src/crimson/osd/stop_signal.h +++ b/src/crimson/osd/stop_signal.h @@ -25,6 +25,7 @@ #include #include #include +#include /// Seastar apps lib namespace @@ -62,13 +63,13 @@ private: } public: stop_signal() { - seastar::engine().handle_signal(SIGINT, [this] { on_signal(); }); - seastar::engine().handle_signal(SIGTERM, [this] { on_signal(); }); + seastar::handle_signal(SIGINT, [this] { on_signal(); }); + seastar::handle_signal(SIGTERM, [this] { on_signal(); }); } ~stop_signal() { // There's no way to unregister a handler yet, so register a no-op handler instead. - seastar::engine().handle_signal(SIGINT, [] {}); - seastar::engine().handle_signal(SIGTERM, [] {}); + seastar::handle_signal(SIGINT, [] {}); + seastar::handle_signal(SIGTERM, [] {}); } seastar::future<> wait() { return _cond.wait([this] { return _abort_source.abort_requested(); }); diff --git a/src/test/crimson/test_alienstore_thread_pool.cc b/src/test/crimson/test_alienstore_thread_pool.cc index 5f8e2d1b707c5..72c3a4e20cdca 100644 --- a/src/test/crimson/test_alienstore_thread_pool.cc +++ b/src/test/crimson/test_alienstore_thread_pool.cc @@ -22,8 +22,8 @@ seastar::future<> test_accumulate(ThreadPool& tp) { }); }; return seastar::map_reduce( - boost::irange(0, N), slow_plus, 0, std::plus{}).then([] (int sum) { - auto r = boost::irange(0 + M, N + M); + std::views::iota(0, N), slow_plus, 0, std::plus{}).then([] (int sum) { + auto r = std::views::iota(0 + M, N + M); if (sum != std::accumulate(r.begin(), r.end(), 0)) { throw std::runtime_error("test_accumulate failed"); } diff --git a/src/test/crimson/test_crimson_scrub.cc b/src/test/crimson/test_crimson_scrub.cc index 6548f6d9973db..22b417ffd154b 100644 --- a/src/test/crimson/test_crimson_scrub.cc +++ b/src/test/crimson/test_crimson_scrub.cc @@ -2,6 +2,7 @@ // vim: ts=8 sw=2 smarttab #include +#include #include