Merge pull request ceph#58452 from Matan-B/wip-matanb-seastar-july7

seastar: update submodule 

Reviewed-by: Samuel Just <[email protected]>

Author: Matan-B

.github/labeler.yml

@@ -154,6 +154,7 @@ crimson:
   - src/crimson/**
   - src/test/crimson/**
   - qa/suites/crimson-rados/**
+  - src/seastar/**
 
 dashboard:
   - src/pybind/mgr/dashboard/**

src/CMakeLists.txt

@@ -387,7 +387,7 @@ if(WITH_SEASTAR)
   set(Seastar_API_LEVEL "6" CACHE STRING "" FORCE)
   set(Seastar_HWLOC OFF CACHE BOOL "" FORCE)
   set(Seastar_IO_URING OFF CACHE BOOL "" FORCE)
-  set(Seastar_STD_OPTIONAL_VARIANT_STRINGVIEW ON CACHE BOOL "" FORCE)
+  set(Seastar_DEPRECATED_OSTREAM_FORMATTERS OFF CACHE BOOL "" FORCE)
   if(Seastar_DPDK)
     find_package(dpdk QUIET)
     if(NOT DPDK_FOUND)

src/crimson/common/coroutine.h

@@ -222,15 +222,15 @@ struct awaiter {
       // silence warning that we are discarding an exceptional future
       if (_future.failed()) _future.get_exception();
       if constexpr (is_errorated) {
-	return maybe_fut->unsafe_get0();
+	return (T)maybe_fut->unsafe_get();
       } else {
-	return maybe_fut->get0();
+	return (T)maybe_fut->get();
       }
     } else {
       if constexpr (is_errorated) {
-	return _future.unsafe_get0();
+	return (T)_future.unsafe_get();
       } else {
-	return _future.get0();
+	return (T)_future.get();
       }
     }
   }

src/crimson/common/errorator.h

@@ -110,7 +110,7 @@ inline auto repeat(AsyncAction action) {
         f.get_exception()
       );
     } else if (f.available()) {
-      if (auto done = f.get0()) {
+      if (auto done = f.get()) {
         return errorator_t::template make_ready_future<>();
       }
     } else {
@@ -751,9 +751,6 @@ struct errorator {
     auto &&unsafe_get() {
       return seastar::future<ValueT>::get();
     }
-    auto unsafe_get0() {
-      return seastar::future<ValueT>::get0();
-    }
     void unsafe_wait() {
       seastar::future<ValueT>::wait();
     }

src/crimson/common/interruptible_future.h

@@ -408,7 +408,7 @@ class [[nodiscard]] interruptible_future_detail<InterruptCond, seastar::future<T
   template <typename U>
   using interrupt_futurize_t =
     typename interruptor<InterruptCond>::template futurize_t<U>;
-  using core_type::get0;
+  using core_type::get;
   using core_type::core_type;
   using core_type::get_exception;
   using core_type::ignore_ready_future;
@@ -719,7 +719,7 @@ class [[nodiscard]] interruptible_future_detail<
 {
 public:
   using core_type = ErroratedFuture<crimson::errorated_future_marker<T>>;
-  using core_type::unsafe_get0;
+  using core_type::unsafe_get;
   using errorator_type = typename core_type::errorator_type;
   using interrupt_errorator_type =
     interruptible_errorator<InterruptCond, errorator_type>;
@@ -1421,7 +1421,7 @@ struct interruptor
         ret = seastar::futurize_invoke(mapper, *begin++).then_wrapped_interruptible(
 	    [s = s.get(), ret = std::move(ret)] (auto f) mutable {
             try {
-                s->result = s->reduce(std::move(s->result), std::move(f.get0()));
+                s->result = s->reduce(std::move(s->result), std::move(f.get()));
                 return std::move(ret);
             } catch (...) {
                 return std::move(ret).then_wrapped_interruptible([ex = std::current_exception()] (auto f) {

src/crimson/os/seastore/async_cleaner.cc

@@ -1513,7 +1513,7 @@ bool SegmentCleaner::check_usage()
         }
       }
     });
-  }).unsafe_get0();
+  }).unsafe_get();
   return space_tracker->equals(*tracker);
 }
 
@@ -1818,7 +1818,7 @@ bool RBMCleaner::check_usage()
 	}
       }
     });
-  }).unsafe_get0();
+  }).unsafe_get();
   return equals(tracker);
 }
 

src/crimson/osd/ops_executer.cc

@@ -1379,8 +1379,8 @@ static PG::interruptible_future<ceph::bufferlist> do_pgls_common(
           }),
         seastar::make_ready_future<hobject_t>(next));
     }).then_interruptible([pg_end](auto&& ret) {
-      auto entries = std::move(std::get<0>(ret).get0());
-      auto next = std::move(std::get<1>(ret).get0());
+      auto entries = std::move(std::get<0>(ret).get());
+      auto next = std::move(std::get<1>(ret).get());
       pg_ls_response_t response;
       response.handle = next.is_max() ? pg_end : next;
       response.entries = std::move(entries);

src/crimson/osd/shard_services.cc

@@ -593,8 +593,8 @@ seastar::future<Ref<PG>> ShardServices::make_pg(
     std::move(get_pool_info_for_pg),
     std::move(get_collection)
   ).then([pgid, create_map, this](auto &&ret) {
-    auto [pool, name, ec_profile] = std::move(std::get<0>(ret).get0());
-    auto coll = std::move(std::get<1>(ret).get0());
+    auto [pool, name, ec_profile] = std::move(std::get<0>(ret).get());
+    auto coll = std::move(std::get<1>(ret).get());
     return seastar::make_ready_future<Ref<PG>>(
       new PG{
 	pgid,

src/crimson/tools/perf_crimson_msgr.cc

@@ -1107,8 +1107,8 @@ static seastar::future<> run(
           "ms_crc_data", crc_enabled ? "true" : "false");
     })
   ).then([=](auto&& ret) {
-    auto server = std::move(std::get<0>(ret).get0());
-    auto client = std::move(std::get<1>(ret).get0());
+    auto server = std::move(std::get<0>(ret).get());
+    auto client = std::move(std::get<1>(ret).get());
     // reserve core 0 for potentially better performance
     if (mode == perf_mode_t::both) {
       logger().info("\nperf settings:\n  smp={}\n  {}\n  {}\n",

src/crimson/tools/perf_staged_fltree.cc

@@ -132,7 +132,7 @@ seastar::future<> run(const bpo::variables_map& config) {
         {range1[0], range1[1]},
         {range0[0], range0[1]});
     PerfTree<TRACK> perf{is_dummy};
-    perf.run(kvs, erase_ratio).get0();
+    perf.run(kvs, erase_ratio).get();
   });
 }