Merge pull request redpanda-data#31381 from redpanda-data/stephan/seastar-263

Upgrade to seastar 26.3.x

Author: StephanDollberg

MODULE.bazel.lock

@@ -1,6 +1,5 @@
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
-load("@rules_cc//cc:cc_import.bzl", "cc_import")
 
 bool_flag(
     name = "gofips",
@@ -95,31 +94,3 @@ config_setting(
         ":antithesis": "true",
     },
 )
-
-# libFuzzer without its main(), so that a fuzz target can bring up a seastar
-# reactor first and run the fuzzing loop inside it (see
-# //src/v/test_utils:seastar_fuzz). The archive's path depends on the clang
-# version and the target triple, so ask the compiler for it rather than spelling
-# it out.
-genrule(
-    name = "libfuzzer_no_main_archive",
-    outs = ["libclang_rt.fuzzer_no_main.a"],
-    cmd = "cp \"$$($(CC) -print-file-name=libclang_rt.fuzzer_no_main.a)\" $@",
-    target_compatible_with = select({
-        ":enable_fuzz_testing": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    toolchains = ["@bazel_tools//tools/cpp:current_cc_toolchain"],
-    visibility = ["//visibility:public"],
-)
-
-cc_import(
-    name = "libfuzzer_no_main",
-    static_library = ":libfuzzer_no_main_archive",
-    target_compatible_with = select({
-        ":enable_fuzz_testing": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    visibility = ["//visibility:public"],
-    alwayslink = True,
-)

bazel/BUILD

@@ -161,13 +161,13 @@ def data_dependency():
         url = "https://github.com/redpanda-data/CRoaring/archive/c433d1c70c10fb2e40f049e019e2abbcafa6e69d.tar.gz",
     )
 
-    # branch: v26.2.x
+    # branch: v26.3.x
     http_archive(
         name = "seastar",
         build_file = "//bazel/thirdparty:seastar.BUILD",
-        sha256 = "0b8f08bb0fc971dfee675707b0119653a18fe5e42274b069bdb1f36b2d18dabd",
-        strip_prefix = "seastar-39dfd216bac408133110edf83c087be322d0256f",
-        url = "https://github.com/redpanda-data/seastar/archive/39dfd216bac408133110edf83c087be322d0256f.tar.gz",
+        sha256 = "5918f72ec59c159a8d2fe36870e7d30c6e61426fde766d7dd6853fa7f9871f7f",
+        strip_prefix = "seastar-a6ac2ff6190a4a9dce5059991355703e1073d11f",
+        url = "https://github.com/redpanda-data/seastar/archive/a6ac2ff6190a4a9dce5059991355703e1073d11f.tar.gz",
     )
 
     http_archive(

bazel/repositories.bzl

@@ -186,8 +186,7 @@ def _redpanda_cc_fuzz_test(
         deps = [],
         custom_args = [],
         env = {},
-        data = [],
-        reactor = False):
+        data = []):
     """
     Helper to define a Redpanda C++ fuzzing test.
 
@@ -200,19 +199,14 @@ def _redpanda_cc_fuzz_test(
       custom_args: arguments from cc_test users
       env: environment variables
       data: data file dependencies
-      reactor: true if the target fuzzes code that needs a seastar reactor, in
-        which case it expands RP_SEASTAR_FUZZ to define main and libFuzzer is linked
-        without one of its own. Otherwise libFuzzer's main is used and the target
-        just defines LLVMFuzzerTestOneInput.
     """
     test_data, test_env, test_deps = _test_options()
-    reactor_deps = ["//bazel:libfuzzer_no_main", "//src/v/test_utils:seastar_fuzz"]
     cc_test(
         name = name,
         timeout = timeout,
         srcs = srcs,
         defines = defines,
-        deps = deps + test_deps + (reactor_deps if reactor else []),
+        deps = deps + test_deps,
         copts = redpanda_copts(),
         args = custom_args,
         features = [
@@ -224,7 +218,7 @@ def _redpanda_cc_fuzz_test(
         env = test_env | env,
         data = data + test_data,
         linkopts = [
-            "-fsanitize=fuzzer-no-link" if reactor else "-fsanitize=fuzzer",
+            "-fsanitize=fuzzer",
         ],
         target_compatible_with = select({
             "//bazel:enable_fuzz_testing": [],
@@ -324,8 +318,7 @@ def redpanda_cc_fuzz_test(
         deps = [],
         args = [],
         env = {},
-        data = [],
-        reactor = False):
+        data = []):
     _redpanda_cc_fuzz_test(
         data = data,
         env = env,
@@ -335,7 +328,6 @@ def redpanda_cc_fuzz_test(
         defines = defines,
         deps = deps,
         custom_args = args,
-        reactor = reactor,
     )
 
 def redpanda_cc_btest_no_seastar(

bazel/test.bzl

@@ -306,6 +306,7 @@ cc_library(
         "src/rpc/rpc.cc",
         "src/util/alloc_failure_injector.cc",
         "src/util/backtrace.cc",
+        "src/util/build_id.cc",
         "src/util/conversions.cc",
         "src/util/exceptions.cc",
         "src/util/file.cc",
@@ -372,9 +373,11 @@ cc_library(
         "include/seastar/core/internal/io_intent.hh",
         "include/seastar/core/internal/io_request.hh",
         "include/seastar/core/internal/io_sink.hh",
+        "include/seastar/core/internal/io_trace.hh",
         "include/seastar/core/internal/linux-aio.hh",
         "include/seastar/core/internal/poll.hh",
         "include/seastar/core/internal/pollable_fd.hh",
+        "include/seastar/core/internal/reactor_trace.hh",
         "include/seastar/core/internal/run_in_background.hh",
         "include/seastar/core/internal/signal_mutex.hh",
         "include/seastar/core/internal/stall_detector.hh",
@@ -482,7 +485,6 @@ cc_library(
         "include/seastar/http/response_parser.hh",
         "include/seastar/http/retry_strategy.hh",
         "include/seastar/http/routes.hh",
-        "include/seastar/http/short_streams.hh",
         "include/seastar/http/transformers.hh",
         "include/seastar/http/types.hh",
         "include/seastar/http/url.hh",
@@ -534,6 +536,7 @@ cc_library(
         "include/seastar/util/indirect.hh",
         "include/seastar/util/integrated-length.hh",
         "include/seastar/util/internal/array_map.hh",
+        "include/seastar/util/internal/build_id.hh",
         "include/seastar/util/internal/iovec_utils.hh",
         "include/seastar/util/internal/magic.hh",
         "include/seastar/util/iostream.hh",
@@ -597,6 +600,9 @@ cc_library(
     }) + select({
         ":use_system_allocator": ["SEASTAR_DEFAULT_ALLOCATOR"],
         "//conditions:default": [],
+    }) + select({
+        ":use_io_uring": ["SEASTAR_HAVE_URING"],
+        "//conditions:default": [],
     }) + select({
         ":with_debug": [
             "SEASTAR_DEBUG",
@@ -638,9 +644,6 @@ cc_library(
     }) + select({
         ":use_hwloc": ["SEASTAR_HAVE_HWLOC"],
         "//conditions:default": [],
-    }) + select({
-        ":use_io_uring": ["SEASTAR_HAVE_URING"],
-        "//conditions:default": [],
     }) + select({
         # this only needs to be applied to memory.cc and reactor.cc. could be
         # split out into a separate cc_library, but we'd need to inherit all the

bazel/thirdparty/seastar.BUILD

@@ -6,3 +6,8 @@ leak:fips/self_test.c
 # This suppression should be revisited/removed once both OpenSSL
 # versions have been updated.
 leak:crypto/mem.c
+
+# alien::message_queue::_pending is a boost::lockfree::queue<work_item*>,
+# where tagged pointers are used to mask addresses. LSan interprets memory
+# (which are pointed to by these tagged pointers) as leaked.
+leak:seastar::alien::message_queue

lsan_suppressions.txt

@@ -92,7 +92,9 @@ redpanda_cc_gtest(
         "//src/v/kafka/server/tests:kafka_test_utils",
         "//src/v/test_utils:gtest",
         "//src/v/test_utils:scoped_config",
+        "@fmt",
         "@googletest//:gtest",
+        "@seastar",
     ],
 )
 

src/v/cloud_topics/tests/BUILD

@@ -14,6 +14,9 @@
 #include "test_utils/async.h"
 #include "test_utils/scoped_config.h"
 
+#include <seastar/util/log.hh>
+
+#include <fmt/format.h>
 #include <gtest/gtest.h>
 
 using tests::kv_t;
@@ -269,9 +272,11 @@ TEST_F(LeaderEpochTest, TestGetLeaderEpochWhileReconciling) {
     gate_fut.get();
 
     ASSERT_FALSE(producer_error.has_value())
-      << "Producer fiber failed with exception " << *producer_error;
+      << "Producer fiber failed with exception "
+      << fmt::format("{}", *producer_error);
     ASSERT_FALSE(validator_error.has_value())
-      << "Validator fiber failed with exception " << *validator_error;
+      << "Validator fiber failed with exception "
+      << fmt::format("{}", *validator_error);
 
     // One more validation.
     auto p = wait_for_leadership().get();

src/v/cloud_topics/tests/leader_epoch_test.cc

@@ -34,7 +34,7 @@ PERF_TEST_C(partition_balancer_planner_fixture, unavailable_nodes) {
     auto planner = make_planner(
       model::partition_autobalancing_mode::continuous, max_concurrent_actions);
 
-    abort_source as;
+    ss::abort_source as;
     perf_tests::start_measuring_time();
     auto plan_data = co_await planner.plan_actions(hr, as);
     perf_tests::stop_measuring_time();
@@ -89,7 +89,7 @@ PERF_TEST_C(partition_balancer_planner_fixture, counts_rebalancing) {
 
     auto planner = make_planner();
 
-    abort_source as;
+    ss::abort_source as;
     perf_tests::start_measuring_time();
     auto plan_data = co_await planner.plan_actions(hr, as);
     perf_tests::stop_measuring_time();

src/v/cluster/tests/partition_balancer_bench.cc

@@ -60,6 +60,7 @@ redpanda_cc_binary(
         "//src/v/model",
         "//src/v/utils:file_io",
         "@boost//:program_options",
+        "@fmt",
         "@seastar",
     ],
 )