diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 19099591a6fc3..bd727a3b20753 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -244,7 +244,7 @@ "moduleExtensions": { "//bazel:extensions.bzl%non_module_dependencies": { "general": { - "bzlTransitiveDigest": "UDD3t1nOqAgJ3A9G7lnEDPzQfwSxGXdG9msIfq+k5cA=", + "bzlTransitiveDigest": "fTIzrNQ1j1wBnG6aCoX8uzFvUHPP+SXufsvJ2MoGndI=", "usagesDigest": "FEiDyZe9eAU6yEqnarZf0XMEUk+prUyYClvq1RU1J98=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -415,9 +415,9 @@ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { "build_file": "@@//bazel/thirdparty:seastar.BUILD", - "sha256": "616e419ed198b33a0907ab555e62bbba115e2aaebb72eda9a661f6a70b5a2a59", - "strip_prefix": "seastar-f7a712e9b3bace919f50f52c4b5b3ff0079900fa", - "url": "https://github.com/redpanda-data/seastar/archive/f7a712e9b3bace919f50f52c4b5b3ff0079900fa.tar.gz" + "sha256": "43068252bf6b1e952390ef00d8884de64599bdd07807793540ebdeb8e70ecba8", + "strip_prefix": "seastar-1fea24e9863e9e5a88681bea3fbc7b8b76705856", + "url": "https://github.com/redpanda-data/seastar/archive/1fea24e9863e9e5a88681bea3fbc7b8b76705856.tar.gz" } }, "unordered_dense": { diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index a7fe323a57e21..8b30daa90a033 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -162,9 +162,9 @@ def data_dependency(): http_archive( name = "seastar", build_file = "//bazel/thirdparty:seastar.BUILD", - sha256 = "616e419ed198b33a0907ab555e62bbba115e2aaebb72eda9a661f6a70b5a2a59", - strip_prefix = "seastar-f7a712e9b3bace919f50f52c4b5b3ff0079900fa", - url = "https://github.com/redpanda-data/seastar/archive/f7a712e9b3bace919f50f52c4b5b3ff0079900fa.tar.gz", + sha256 = "43068252bf6b1e952390ef00d8884de64599bdd07807793540ebdeb8e70ecba8", + strip_prefix = "seastar-1fea24e9863e9e5a88681bea3fbc7b8b76705856", + url = "https://github.com/redpanda-data/seastar/archive/1fea24e9863e9e5a88681bea3fbc7b8b76705856.tar.gz", ) http_archive( diff --git a/bazel/thirdparty/seastar.BUILD b/bazel/thirdparty/seastar.BUILD index 36e44a80efc7f..6c2166299d898 100644 --- a/bazel/thirdparty/seastar.BUILD +++ b/bazel/thirdparty/seastar.BUILD @@ -204,6 +204,7 @@ cc_library( "src/core/cgroup.hh", "src/core/condition-variable.cc", "src/core/cpu_profiler.cc", + "src/core/disk_params.cc", "src/core/dpdk_rte.cc", "src/core/exception_hacks.cc", "src/core/execution_stage.cc", @@ -323,6 +324,7 @@ cc_library( "include/seastar/core/condition-variable.hh", "include/seastar/core/coroutine.hh", "include/seastar/core/deleter.hh", + "include/seastar/core/disk_params.hh", "include/seastar/core/distributed.hh", "include/seastar/core/do_with.hh", "include/seastar/core/dpdk_rte.hh", @@ -506,7 +508,6 @@ cc_library( "include/seastar/util/backtrace.hh", "include/seastar/util/bool_class.hh", "include/seastar/util/closeable.hh", - "include/seastar/util/concepts.hh", "include/seastar/util/conversions.hh", "include/seastar/util/critical_alloc_section.hh", "include/seastar/util/defer.hh", @@ -563,7 +564,7 @@ cc_library( "SEASTAR_API_LEVEL=$(API_LEVEL)", "SEASTAR_HAS_MEMBARRIER", "SEASTAR_SCHEDULING_GROUPS_COUNT=$(SCHEDULING_GROUPS)", - "SEASTAR_WITH_TLS_OSSL", + "SEASTAR_USE_OPENSSL", "SEASTAR_DEPRECATED_OSTREAM_FORMATTERS", ] + select({ ":use_task_backtrace": ["SEASTAR_TASK_BACKTRACE"], diff --git a/src/v/pandaproxy/error.cc b/src/v/pandaproxy/error.cc index f444693bf8c39..af0e0a093d9b9 100644 --- a/src/v/pandaproxy/error.cc +++ b/src/v/pandaproxy/error.cc @@ -57,6 +57,8 @@ struct reply_error_category final : std::error_category { return "HTTP 305 Use Proxy"; case reply_error_code::temporary_redirect: return "HTTP 307 Temporary Redirect"; + case reply_error_code::permanent_redirect: + return "HTTP 308 Permanent Redirect"; case reply_error_code::bad_request: return "HTTP 400 Bad Request"; case reply_error_code::unauthorized: @@ -404,6 +406,8 @@ std::error_condition make_error_condition(ss::http::reply::status_type st) { return rec::use_proxy; case sec::temporary_redirect: return rec::temporary_redirect; + case sec::permanent_redirect: + return rec::permanent_redirect; case sec::bad_request: return rec::kafka_bad_request; case sec::unauthorized: diff --git a/src/v/pandaproxy/error.h b/src/v/pandaproxy/error.h index 0896cab55e06d..63a97905a5898 100644 --- a/src/v/pandaproxy/error.h +++ b/src/v/pandaproxy/error.h @@ -42,6 +42,7 @@ enum class reply_error_code : uint16_t { not_modified = 304, use_proxy = 305, temporary_redirect = 307, + permanent_redirect = 308, bad_request = 400, unauthorized = 401, payment_required = 402,