Merge pull request ceph#63232 from amathuria/wip-amat-update-seastar

seastar: bump up seastar submodule

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

Author: Matan-B

install-deps.sh

@@ -426,8 +426,9 @@ else
                 [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu focal
                 ;;
             *Jammy*)
-                [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu jammy
                 $SUDO apt-get install -y gcc
+		ensure_decent_gcc_on_ubuntu 12 jammy
+                [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu jammy
                 ;;
             *)
                 $SUDO apt-get install -y gcc

src/crimson/tools/perf_crimson_msgr.cc

@@ -44,15 +44,16 @@ seastar::logger& logger() {
   return crimson::get_logger(ceph_subsys_ms);
 }
 
+template <typename T>
+static std::list<seastar::lw_shared_ptr<seastar::sharded<T>>> sharded_objects;
+
 template <typename T, typename... Args>
 seastar::future<T*> create_sharded(Args... args) {
   // seems we should only construct/stop shards on #0
   return seastar::smp::submit_to(0, [=] {
     auto sharded_obj = seastar::make_lw_shared<seastar::sharded<T>>();
+    sharded_objects<T>.push_back(sharded_obj);
     return sharded_obj->start(args...).then([sharded_obj]() {
-      seastar::engine().at_exit([sharded_obj]() {
-          return sharded_obj->stop().then([sharded_obj] {});
-        });
       return sharded_obj.get();
     });
   }).then([] (seastar::sharded<T> *ptr_shard) {
@@ -1167,8 +1168,23 @@ static seastar::future<> run(
       });
     }
   }).finally([] {
-    return crimson::common::sharded_conf().stop();
+      return seastar::smp::submit_to(0, [] {
+        return seastar::do_for_each(sharded_objects<test_state::Server>,
+	    [](auto& sharded_obj) {
+	  return sharded_obj->stop();
+        }).then([] {
+        return seastar::do_for_each(sharded_objects<test_state::Client>,
+	    [](auto& sharded_obj) {
+	    return sharded_obj->stop();
+          });
+        });
+     }).then([] {
+     sharded_objects<test_state::Server>.clear();
+     sharded_objects<test_state::Client>.clear();
+     return crimson::common::sharded_conf().stop();
+    });
   });
+
 }
 
 }

src/crimson/tools/perf_staged_fltree.cc

@@ -5,6 +5,7 @@
 
 #include <seastar/core/app-template.hh>
 #include <seastar/core/thread.hh>
+#include <seastar/util/closeable.hh>
 
 #include "crimson/common/config_proxy.h"
 #include "crimson/common/log.h"
@@ -116,15 +117,11 @@ seastar::future<> run(const bpo::variables_map& config) {
 
     using crimson::common::sharded_conf;
     sharded_conf().start(EntityName{}, std::string_view{"ceph"}).get();
-    seastar::engine().at_exit([] {
-      return sharded_conf().stop();
-    });
+    auto sharded_conf_stop = seastar::deferred_stop(sharded_conf());
 
     using crimson::common::sharded_perf_coll;
     sharded_perf_coll().start().get();
-    seastar::engine().at_exit([] {
-      return sharded_perf_coll().stop();
-    });
+    auto sharded_perf_stop = seastar::deferred_stop(sharded_perf_coll());
 
     auto kvs = KVPool<test_item_t>::create_raw_range(
         ns_sizes, oid_sizes, onode_sizes,

src/seastar

@@ -54,19 +54,34 @@ static entity_addr_t get_server_addr() {
   return saddr;
 }
 
+/*
+ * at_exit() is now deprecated, and Seastar recommends using deferred_stop()
+ * as an alternative for object cleanup.
+ *
+ * However, in our use case, deferred_stop() is not a suitable replacement
+ * due to differences in how it manages object lifetimes.
+ *
+ * Previously, at_exit() captured the sharded_obj and kept it alive until shutdown.
+ * In contrast, deferred_stop() does not retain ownership and assumes the referenced
+ * object remains valid for the lifetime of the deferred_stop instance.
+ *
+ * To address this, we introduced a static list to retain each sharded_obj
+ * created via create_sharded().
+ */
+
+template <typename T>
+static std::list<seastar::lw_shared_ptr<seastar::sharded<T>>> sharded_objects;
+
 template <typename T, typename... Args>
 seastar::future<T*> create_sharded(Args... args) {
   // we should only construct/stop shards on #0
-  return seastar::smp::submit_to(0, [=] {
+  return seastar::smp::submit_to(0, [=]() -> seastar::future<seastar::sharded<T>*> {
     auto sharded_obj = seastar::make_lw_shared<seastar::sharded<T>>();
-    return sharded_obj->start(args...
-    ).then([sharded_obj] {
-      seastar::engine().at_exit([sharded_obj] {
-        return sharded_obj->stop().then([sharded_obj] {});
-      });
+    sharded_objects<T>.push_back(sharded_obj);
+    return sharded_obj->start(args...).then([sharded_obj] {
       return sharded_obj.get();
     });
-  }).then([](seastar::sharded<T> *ptr_shard) {
+  }).then([](seastar::sharded<T>* ptr_shard) {
     return &ptr_shard->local();
   });
 }
@@ -390,6 +405,15 @@ static seastar::future<> test_echo(unsigned rounds,
     }).handle_exception([](auto eptr) {
       logger().error("test_echo() failed: got exception {}", eptr);
       throw;
+    }).then([] {
+      return seastar::smp::submit_to(0, [] {
+	return seastar::do_for_each(sharded_objects<test_state::Client>,
+	    [](auto& sharded_obj) {
+	  return sharded_obj->stop();
+        });
+      }).then([] {
+	sharded_objects<test_state::Client>.clear();
+      });
     }).finally([gates, server1, server2] {
       return gates->close();
     });
@@ -3832,6 +3856,15 @@ seastar::future<int> do_test(seastar::app_template& app)
       // which will result in memory leak and thus fail LeakSanitizer.
       return seastar::sleep(100ms);
     });
+  }).then([] {
+    return seastar::smp::submit_to(0, [] {
+      return seastar::do_for_each(sharded_objects<ShardedGates>,
+	  [](auto& sharded_obj) {
+	return sharded_obj->stop();
+      });
+    }).then([] {
+       sharded_objects<ShardedGates>.clear();
+    });
   }).then([] {
     return crimson::common::sharded_conf().stop();
   }).then([] {