Merge pull request ceph#55878 from athanatos/sjust/wip-seastar-module

crimson: update seastar submodule to fix prometheus build error Reviewed-by: Radoslaw Zarzynski <[email protected]>
ssdohammer-sl · Mar 2, 2024 · 3c07100 · 3c07100
2 parents 8c92912 + 2806cdb
commit 3c07100
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h
@@ -69,7 +69,6 @@ namespace seastar::internal {
   {};
 }
 
-SEASTAR_CONCEPT(
 namespace crimson::interruptible {
   template<typename InterruptCond, typename FutureType>
   class interruptible_future_detail;
@@ -79,7 +78,6 @@ namespace seastar::impl {
   struct is_tuple_of_futures<std::tuple<crimson::interruptible::interruptible_future_detail<InterruptCond, FutureType>, Rest...>>
     : is_tuple_of_futures<std::tuple<Rest...>> {};
 }
-)
 
 namespace crimson::interruptible {
 

diff --git a/src/seastar b/src/seastar
+7 −7		.circleci/config.yml
+2 −1		CMakeLists.txt
+0 −6		HACKING.md
+10 −1		apps/io_tester/conf.yaml
+175 −36		apps/io_tester/io_tester.cc
+1 −1		configure.py
+7 −4		doc/io-tester.md
+1 −1		doc/lambda-coroutine-fiasco.md
+7 −1		doc/rpc.md
+11 −4		docker/dev/Dockerfile
+1 −3		include/seastar/core/abort_source.hh
+3 −5		include/seastar/core/abortable_fifo.hh
+3 −4		include/seastar/core/alien.hh
+3 −6		include/seastar/core/bitops.hh
+4 −9		include/seastar/core/checked_ptr.hh
+2 −2		include/seastar/core/circular_buffer.hh
+6 −6		include/seastar/core/condition-variable.hh
+2 −3		include/seastar/core/execution_stage.hh
+0 −1		include/seastar/core/fair_queue.hh
+4 −4		include/seastar/core/file.hh
+10 −20		include/seastar/core/future.hh
+2 −2		include/seastar/core/internal/io_sink.hh
+2 −2		include/seastar/core/internal/poll.hh
+3 −0		include/seastar/core/io_priority_class.hh
+23 −23		include/seastar/core/iostream-impl.hh
+4 −5		include/seastar/core/iostream.hh
+15 −15		include/seastar/core/loop.hh
+6 −6		include/seastar/core/map_reduce.hh
+1 −1		include/seastar/core/metrics_api.hh
+14 −14		include/seastar/core/queue.hh
+0 −3		include/seastar/core/reactor_config.hh
+5 −5		include/seastar/core/scheduling.hh
+4 −4		include/seastar/core/scheduling_specific.hh
+2 −0		include/seastar/core/shard_id.hh
+11 −14		include/seastar/core/sharded.hh
+8 −32		include/seastar/core/shared_mutex.hh
+5 −5		include/seastar/core/smp.hh
+3 −5		include/seastar/core/sstring.hh
+0 −2		include/seastar/core/timer-set.hh
+5 −8		include/seastar/core/when_all.hh
+1 −1		include/seastar/core/when_any.hh
+2 −3		include/seastar/core/with_scheduling_group.hh
+24 −4		include/seastar/coroutine/exception.hh
+2 −2		include/seastar/coroutine/parallel_for_each.hh
+1 −2		include/seastar/http/client.hh
+14 −2		include/seastar/http/handlers.hh
+0 −8		include/seastar/http/routes.hh
+5 −5		include/seastar/json/json_elements.hh
+7 −4		include/seastar/rpc/multi_algo_compressor_factory.hh
+1 −1		include/seastar/rpc/rpc.hh
+7 −0		include/seastar/rpc/rpc_types.hh
+7 −17		include/seastar/util/closeable.hh
+5 −10		include/seastar/util/concepts.hh
+3 −5		include/seastar/util/defer.hh
+2 −2		include/seastar/util/file.hh
+9 −3		include/seastar/util/log.hh
+2 −2		include/seastar/util/noncopyable_function.hh
+1 −5		include/seastar/util/optimized_optional.hh
+5 −5		include/seastar/util/print_safe.hh
+2 −4		include/seastar/util/shared_token_bucket.hh
+2 −3		include/seastar/util/tmp_file.hh
+132 −109		scripts/seastar-json2code.py
+2 −2		src/core/file.cc
+2 −2		src/core/memory.cc
+0 −1		src/core/metrics.cc
+6 −6		src/core/prometheus.cc
+41 −32		src/core/reactor.cc
+1 −2		src/core/reactor_backend.cc
+1 −1		src/core/thread.cc
+2 −3		src/http/client.cc
+2 −2		src/http/json_path.cc
+1 −8		src/http/routes.cc
+2 −2		src/rpc/lz4_compressor.cc
+17 −5		src/rpc/rpc.cc
+15 −8		src/util/log.cc
+30 −10		tests/perf/perf_tests.cc
+1 −1		tests/unit/alloc_test.cc
+30 −11		tests/unit/httpd_test.cc
+157 −0		tests/unit/rpc_test.cc
+4 −2		tests/unit/sstring_test.cc