Skip to content

Commit 43ab2f6

Browse files
authored
Disable DLB. (#45568)
Commit Message: Disable DLB due to breakage of contrib build. Additional Description: Risk Level: Testing: Docs Changes: Release Notes: included Fixes #45491 Signed-off-by: Kevin Baichoo <envoy@kevinbaichoo.com>
1 parent f3ad716 commit 43ab2f6

13 files changed

Lines changed: 51 additions & 65 deletions

File tree

api/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.proto

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
1313
// [#protodoc-title: Dlb connection balancer configuration]
1414
// DLB :ref:`configuration overview <config_connection_balance_dlb>`.
1515
// [#extension: envoy.network.connection_balance.dlb]
16+
// [#not-implemented-hide:]
17+
//
18+
// The envoy.network.connection_balance.dlb extension is currently disabled
19+
// at the Bazel layer — see https://github.com/envoyproxy/envoy/issues/45491.
20+
// The ``[#not-implemented-hide:]`` annotation above suppresses docs
21+
// generation for this file so protodoc does not try to look the extension
22+
// up in extensions_metadata.yaml (which has been removed in lockstep with
23+
// the ``contrib_build_config.bzl`` entry). Drop the annotation when the
24+
// upstream ``@dlb`` mirror is healthy again.
1625

1726
// The Dlb is a hardware managed system of queues and arbiters connecting producers and consumers. It is a PCIE device
1827
// in the CPU package. It interacts with software running on cores and potentially other devices. The Dlb implements the

api/envoy/config/listener/v3/listener.proto

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ message Listener {
114114

115115
// The listener will use the connection balancer according to ``type_url``. If ``type_url`` is invalid,
116116
// Envoy will not attempt to balance active connections between worker threads.
117-
// [#extension-category: envoy.network.connection_balance]
117+
// The ``envoy.network.connection_balance`` extension category is currently empty
118+
// because the only registered member (``envoy.network.connection_balance.dlb``)
119+
// is disabled. See https://github.com/envoyproxy/envoy/issues/45491.
118120
core.v3.TypedExtensionConfig extend_balance = 2;
119121
}
120122
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
The contrib extension ``envoy.network.connection_balance.dlb`` (Intel DLB
2+
connection balancer) has been disabled at the Bazel layer for all builds and
3+
platforms due to a breakage at the source archive.
4+
5+
See https://github.com/envoyproxy/envoy/issues/45491 for local workarounds.

contrib/contrib_build_config.bzl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@ CONTRIB_EXTENSIONS = {
8484
# Connection Balance extensions
8585
#
8686

87-
"envoy.network.connection_balance.dlb": "//contrib/dlb/source:connection_balancer",
87+
# Disabled: upstream Intel mirror (downloadmirror.intel.com) returns HTTP
88+
# 202 Accepted instead of 200 OK, breaking @dlb external_http_archive
89+
# fetches and aborting //contrib/exe:envoy-static. See
90+
# https://github.com/envoyproxy/envoy/issues/45491
91+
# "envoy.network.connection_balance.dlb": "//contrib/dlb/source:connection_balancer",
8892

8993
#
9094
# Regex engines

contrib/dlb/source/BUILD

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,28 @@ licenses(["notice"]) # Apache 2
1313

1414
envoy_contrib_package()
1515

16+
# The envoy.network.connection_balance.dlb extension is disabled at the
17+
# Bazel layer because the upstream Intel mirror (downloadmirror.intel.com)
18+
# serving @dlb returns HTTP 202 Accepted instead of 200 OK, which aborts
19+
# Bazel external_http_archive fetches and breaks any build of
20+
# //contrib/exe:envoy-static (and any test under //contrib/dlb/...). See
21+
# https://github.com/envoyproxy/envoy/issues/45491. The targets below
22+
# carry tags = ["manual"] so they are excluded from wildcard builds and
23+
# tests (//contrib/...). The matching registration in
24+
# //contrib:contrib_build_config.bzl is commented out so envoy-static no
25+
# longer pulls them in. Drop the "manual" tags (and restore the build
26+
# config + metadata entries) when the upstream @dlb mirror is healthy
27+
# again or if that does not occur, we will consider dropping this extension.
1628
make(
1729
name = "dlb",
1830
env = {"DLB_DISABLE_DOMAIN_SERVER": "TRUE"},
1931
lib_source = "@dlb//:libdlb",
2032
out_static_libs = ["libdlb.a"],
2133
postfix_script = "mv libdlb.a $$INSTALLDIR/lib && rm -rf $$INSTALLDIR/include && mkdir -p $$INSTALLDIR/include && cp -L *.h $$INSTALLDIR/include",
22-
tags = ["skip_on_windows"],
34+
tags = [
35+
"manual",
36+
"skip_on_windows",
37+
],
2338
target_compatible_with = envoy_contrib_linux_x86_64_constraints(),
2439
targets = ["libdlb.a"],
2540
)
@@ -37,6 +52,7 @@ envoy_cc_contrib_extension(
3752
"DLB_DISABLED=1",
3853
],
3954
}),
55+
tags = ["manual"],
4056
deps = [
4157
"//envoy/api:api_interface",
4258
"//envoy/registry",

contrib/dlb/test/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@ licenses(["notice"]) # Apache 2
88

99
envoy_contrib_package()
1010

11+
# Disabled along with the envoy.network.connection_balance.dlb extension —
12+
# see https://github.com/envoyproxy/envoy/issues/45491 and the matching
13+
# patch in //contrib:contrib_build_config.bzl. The "manual" tag excludes
14+
# this test from wildcard builds and tests under //contrib/..., avoiding
15+
# the broken @dlb fetch. Drop it when the upstream mirror is healthy.
1116
envoy_cc_test(
1217
name = "config_test",
1318
srcs = select({
1419
"//bazel:linux_x86_64": ["config_test.cc"],
1520
"//conditions:default": [],
1621
}),
1722
rbe_pool = "6gig",
23+
tags = ["manual"],
1824
deps = [
1925
"//contrib/dlb/source:connection_balancer",
2026
"//source/common/protobuf:utility_lib",

contrib/extensions_metadata.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,12 @@ envoy.filters.http.language:
108108
- envoy.filters.http
109109
security_posture: requires_trusted_downstream_and_upstream
110110
status: alpha
111-
envoy.network.connection_balance.dlb:
112-
categories:
113-
- envoy.network.connection_balance
114-
security_posture: requires_trusted_downstream_and_upstream
115-
status: alpha
111+
# Removed due to #45491.
112+
# envoy.network.connection_balance.dlb:
113+
# categories:
114+
# - envoy.network.connection_balance
115+
# security_posture: requires_trusted_downstream_and_upstream
116+
# status: alpha
116117
envoy.regex_engines.hyperscan:
117118
categories:
118119
- envoy.regex_engines

docs/root/api-v3/config/contrib/contrib.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Contrib extensions
1212
cryptomb/cryptomb
1313
hyperscan/matcher
1414
hyperscan/regex_engine
15-
dlb/dlb
1615
postgres/postgres
1716
qat/qat
1817
kae/kae

docs/root/api-v3/config/contrib/dlb/dlb.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

docs/root/api-v3/listeners/listeners.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Listeners
66
:maxdepth: 2
77

88
../config/listener/v3/api_listener.proto
9-
../extensions/network/connection_balance/dlb/v3alpha/dlb.proto
109
../config/listener/v3/listener_components.proto
1110
../config/listener/v3/listener.proto
1211
../config/listener/v3/quic_config.proto

0 commit comments

Comments
 (0)