From 9046610ded0ffbe448df31105dbe81b72f07c0d9 Mon Sep 17 00:00:00 2001 From: Stephan Dollberg Date: Mon, 14 Oct 2024 10:12:44 +0100 Subject: [PATCH 1/2] bazel: Update seastar ref --- MODULE.bazel.lock | 8 ++++---- bazel/repositories.bzl | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 9bec459e15b8..190a34484ad2 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -171,7 +171,7 @@ "moduleExtensions": { "//bazel:extensions.bzl%non_module_dependencies": { "general": { - "bzlTransitiveDigest": "Lbym0V8QC5CgB4Ja6cI2QZLO4RHkHXMREUETEHvWCkc=", + "bzlTransitiveDigest": "msutg4GYJql2xCaEjuA/wNiTJxwUfXKpxHGAEtRs9qM=", "usagesDigest": "bsXDsdl5Gq0iZDf6R9bhf3oHUM35HAGF1usXoFeQrF0=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -312,9 +312,9 @@ "ruleClassName": "http_archive", "attributes": { "build_file": "@@//bazel/thirdparty:seastar.BUILD", - "sha256": "948e5f8ad769114a4721c81d5829f675ac51482e4a9a106d57ab313104308666", - "strip_prefix": "seastar-4350d7960ec5ac8a1cf9274316c8f1ab1896d24e", - "url": "https://github.com/redpanda-data/seastar/archive/4350d7960ec5ac8a1cf9274316c8f1ab1896d24e.tar.gz", + "sha256": "6451633c3a4c0422845f441994fe87d1f5a3caabf3e9d4abec733e47bfbed896", + "strip_prefix": "seastar-4a3406ce4071f0bc472233c4c669582ca527db89", + "url": "https://github.com/redpanda-data/seastar/archive/4a3406ce4071f0bc472233c4c669582ca527db89.tar.gz", "patches": [ "@@//bazel/thirdparty:seastar-fortify-source.patch" ], diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 355943f3b52a..be86ea3ad61f 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -167,9 +167,9 @@ def data_dependency(): http_archive( name = "seastar", build_file = "//bazel/thirdparty:seastar.BUILD", - sha256 = "948e5f8ad769114a4721c81d5829f675ac51482e4a9a106d57ab313104308666", - strip_prefix = "seastar-4350d7960ec5ac8a1cf9274316c8f1ab1896d24e", - url = "https://github.com/redpanda-data/seastar/archive/4350d7960ec5ac8a1cf9274316c8f1ab1896d24e.tar.gz", + sha256 = "6451633c3a4c0422845f441994fe87d1f5a3caabf3e9d4abec733e47bfbed896", + strip_prefix = "seastar-4a3406ce4071f0bc472233c4c669582ca527db89", + url = "https://github.com/redpanda-data/seastar/archive/4a3406ce4071f0bc472233c4c669582ca527db89.tar.gz", patches = ["//bazel/thirdparty:seastar-fortify-source.patch"], patch_args = ["-p1"], ) From 7b4cfb04eabf4aa9e14860d22e2e45b22dd50253 Mon Sep 17 00:00:00 2001 From: Stephan Dollberg Date: Mon, 14 Oct 2024 10:12:56 +0100 Subject: [PATCH 2/2] admin: Use ss::json::stream_object to render response This uses zero copy encoding into the output stream avoiding oversized allocations. Ref CORE-7802 --- src/v/redpanda/admin/cluster_config_schema_util.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/v/redpanda/admin/cluster_config_schema_util.cc b/src/v/redpanda/admin/cluster_config_schema_util.cc index 7b5fc617524e..cfbd043d2825 100644 --- a/src/v/redpanda/admin/cluster_config_schema_util.cc +++ b/src/v/redpanda/admin/cluster_config_schema_util.cc @@ -12,6 +12,8 @@ #include "redpanda/admin/api-doc/cluster_config.json.hh" +#include + // This is factored out to make it a separate binary that can generate schema // without bringing up a redpanda cluster. Down stream tools can make use of // this for config generation. @@ -81,5 +83,5 @@ util::generate_json_schema(const config::configuration& conf) { std::map response = { {ss::sstring("properties"), std::move(properties)}}; - return ss::json::json_return_type(std::move(response)); + return ss::json::stream_object(std::move(response)); }