mirror of
https://github.com/coredns/coredns.git
synced 2026-10-09 12:05:22 -04:00
plugin/quic: add max_connections directive (#8610)
* plugin/quic: add max_connections directive Brings quic to parity with https and https3, which both already expose max_connections. The server-side plumbing already exists and is already wired up: core/dnsserver/config.go declares MaxQUICConnections *int, and server_quic.go already consumes it (DefaultQUICMaxConnections = 200, gates accepted connections on a semaphore sized from it). It was just never parsed from a Corefile directive for the quic plugin itself, so setting it today fails with "unknown property 'max_connections'". Adds the max_connections case to parseQuic, mirroring https3's exact validation (non-negative integer, 0 disables the limit, duplicate definition rejected) since the two share a config field. #8187 did the same shaped fix for https3 reaching parity with https; this does the equivalent for quic, the one remaining sibling without it. Extends TestQuicSetup with max_connections coverage (valid value, 0, missing arg, non-numeric, negative, duplicate definition, extra arg). Verified it fails without the setup.go change (unknown property error) and passes with it. Signed-off-by: stackedbyaradhya <aradhyaj736@gmail.com> * core/dnsserver: propagate MaxQUICConnections across server block keys Addresses review feedback on this PR: Caddy only runs directive setup for the first key in a server block, and the QUIC server reads MaxQUICConnections from group[0]. propagateConfigParams copies listener-wide settings from the first config in a block to the others, but it did not propagate this field. In a multi-transport block where the quic key isn't first, e.g.: .:53 quic://.:8853 { quic { max_connections 1 } } the value was stored on the first (DNS) config while the QUIC config kept MaxQUICConnections nil, so NewServerQUIC silently fell back to the default limit of 200 instead of the configured one. Adds the propagation line, mirroring the existing MaxHTTPSStreams entry (and its comment) added for the equivalent key-order issue on https. Added TestPropagateConfigParamsMaxQUICConnections, mirroring the existing TestPropagateConfigParamsMaxHTTPSStreams. Verified it fails without the register.go change and passes with it. Signed-off-by: stackedbyaradhya <aradhyaj736@gmail.com> --------- Signed-off-by: stackedbyaradhya <aradhyaj736@gmail.com>
This commit is contained in:
@@ -14,6 +14,7 @@ func TestQuicSetup(t *testing.T) {
|
||||
input string
|
||||
shouldErr bool
|
||||
expectedMaxStreams *int
|
||||
expectedMaxConnections *int
|
||||
expectedWorkerPoolSize *int
|
||||
expectedErrContent string
|
||||
}{
|
||||
@@ -39,6 +40,20 @@ func TestQuicSetup(t *testing.T) {
|
||||
expectedMaxStreams: new(100),
|
||||
expectedWorkerPoolSize: nil,
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
max_connections 50
|
||||
}`,
|
||||
shouldErr: false,
|
||||
expectedMaxConnections: new(50),
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
max_connections 0
|
||||
}`,
|
||||
shouldErr: false,
|
||||
expectedMaxConnections: new(0),
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
worker_pool_size 1000
|
||||
@@ -50,10 +65,12 @@ func TestQuicSetup(t *testing.T) {
|
||||
{
|
||||
input: `quic {
|
||||
max_streams 100
|
||||
max_connections 50
|
||||
worker_pool_size 1000
|
||||
}`,
|
||||
shouldErr: false,
|
||||
expectedMaxStreams: new(100),
|
||||
expectedMaxConnections: new(50),
|
||||
expectedWorkerPoolSize: new(1000),
|
||||
},
|
||||
{
|
||||
@@ -98,6 +115,43 @@ func TestQuicSetup(t *testing.T) {
|
||||
shouldErr: true,
|
||||
expectedErrContent: "positive integer",
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
max_connections
|
||||
}`,
|
||||
shouldErr: true,
|
||||
expectedErrContent: "Wrong argument count",
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
max_connections abc
|
||||
}`,
|
||||
shouldErr: true,
|
||||
expectedErrContent: "invalid max_connections value",
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
max_connections -10
|
||||
}`,
|
||||
shouldErr: true,
|
||||
expectedErrContent: "non-negative integer",
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
max_connections 50
|
||||
max_connections 100
|
||||
}`,
|
||||
shouldErr: true,
|
||||
expectedErrContent: "already defined",
|
||||
expectedMaxConnections: new(50),
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
max_connections 100 200
|
||||
}`,
|
||||
shouldErr: true,
|
||||
expectedErrContent: "Wrong argument count",
|
||||
},
|
||||
{
|
||||
input: `quic {
|
||||
worker_pool_size
|
||||
@@ -189,6 +243,7 @@ func TestQuicSetup(t *testing.T) {
|
||||
if !test.shouldErr || (test.shouldErr && strings.Contains(test.expectedErrContent, "already defined")) {
|
||||
config := dnsserver.GetConfig(c)
|
||||
assertMaxStreamsValue(t, i, test.input, config.MaxQUICStreams, test.expectedMaxStreams)
|
||||
assertMaxConnectionsValue(t, i, test.input, config.MaxQUICConnections, test.expectedMaxConnections)
|
||||
assertWorkerPoolSizeValue(t, i, test.input, config.MaxQUICWorkerPoolSize, test.expectedWorkerPoolSize)
|
||||
}
|
||||
}
|
||||
@@ -213,6 +268,25 @@ func assertMaxStreamsValue(t *testing.T, testIndex int, testInput string, actual
|
||||
}
|
||||
}
|
||||
|
||||
// assertMaxConnectionsValue compares the actual MaxQUICConnections value with the expected one
|
||||
func assertMaxConnectionsValue(t *testing.T, testIndex int, testInput string, actual, expected *int) {
|
||||
t.Helper()
|
||||
if actual == nil && expected == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if (actual == nil) != (expected == nil) {
|
||||
t.Errorf("Test %d (%s): Expected MaxQUICConnections to be %v, but got %v",
|
||||
testIndex, testInput, formatNilableInt(expected), formatNilableInt(actual))
|
||||
return
|
||||
}
|
||||
|
||||
if *actual != *expected {
|
||||
t.Errorf("Test %d (%s): Expected MaxQUICConnections to be %d, but got %d",
|
||||
testIndex, testInput, *expected, *actual)
|
||||
}
|
||||
}
|
||||
|
||||
// assertWorkerPoolSizeValue compares the actual MaxQUICWorkerPoolSize value with the expected one
|
||||
func assertWorkerPoolSizeValue(t *testing.T, testIndex int, testInput string, actual, expected *int) {
|
||||
t.Helper()
|
||||
|
||||
Reference in New Issue
Block a user