Skip to content

Commit 9f39d6c

Browse files
committed
MINOR: support keyword tune.notsent-lowat.client in global section
Signed-off-by: Vincent Gramer <vgramer@haproxy.com>
1 parent c914b66 commit 9f39d6c

11 files changed

Lines changed: 42 additions & 2 deletions

File tree

config-parser/section-parsers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
326326
addParser(parser, &sequence, &simple.Number{Name: "tune.maxpollevents"})
327327
addParser(parser, &sequence, &simple.Number{Name: "tune.maxrewrite"})
328328
addParser(parser, &sequence, &simple.Number{Name: "tune.memory.hot-size"})
329+
addParser(parser, &sequence, &simple.Size{Name: "tune.notsent-lowat.client"})
329330
addParser(parser, &sequence, &simple.Number{Name: "tune.pattern.cache-size"})
330331
addParser(parser, &sequence, &simple.Number{Name: "tune.peers.max-updates-at-once"})
331332
addParser(parser, &sequence, &simple.Size{Name: "tune.pipesize"})

config-parser/tests/configs/haproxy.cfg.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ global
5656
tune.h2.fe.rxbuf 32k
5757
tune.h2.zero-copy-fwd-send on
5858
tune.lua.maxmem 65536
59+
tune.notsent-lowat.client 32k
5960
tune.pt.zero-copy-forwarding on
6061
tune.renice.runtime -10
6162
tune.renice.startup 8

configuration/global.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,6 +1647,15 @@ func parseTuneOptions(p parser.Parser) (*models.TuneOptions, error) { //nolint:g
16471647
options.H2ZeroCopyFwdSend = strOption
16481648
}
16491649

1650+
intPOption, err = parseSizeOption(p, "tune.notsent-lowat.client")
1651+
if err != nil {
1652+
return nil, err
1653+
}
1654+
if intPOption != nil {
1655+
isEmpty = false
1656+
options.NotsentLowatClient = intPOption
1657+
}
1658+
16501659
strOption, err = parseOnOffOption(p, "tune.pt.zero-copy-forwarding")
16511660
if err != nil {
16521661
return nil, err
@@ -3854,6 +3863,9 @@ func serializeTuneOptions(p parser.Parser, options *models.TuneOptions, configOp
38543863
if err := serializeOnOffOption(p, "tune.h2.zero-copy-fwd-send", options.H2ZeroCopyFwdSend); err != nil {
38553864
return err
38563865
}
3866+
if err := serializeSizeOption(p, "tune.notsent-lowat.client", options.NotsentLowatClient); err != nil {
3867+
return err
3868+
}
38573869
if err := serializeOnOffOption(p, "tune.pt.zero-copy-forwarding", options.PtZeroCopyForwarding); err != nil {
38583870
return err
38593871
}

models/tune_options.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/tune_options_compare.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/tune_options_compare_test.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/build/haproxy_spec.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,6 +1615,11 @@ definitions:
16151615
type: integer
16161616
x-display-name: Per-thread Amount of Memory
16171617
x-nullable: true
1618+
notsent_lowat_client:
1619+
type: integer
1620+
x-display-name: Client Not Sent Low Watermark
1621+
x-nullable: true
1622+
x-size: true
16181623
pattern_cache_size:
16191624
type: integer
16201625
x-display-name: Pattern Lookup Cache Size

specification/models/configuration/global.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,11 @@ tune_options:
594594
type: integer
595595
x-display-name: Per-thread Amount of Memory
596596
x-nullable: true
597+
notsent_lowat_client:
598+
type: integer
599+
x-display-name: Client Not Sent Low Watermark
600+
x-nullable: true
601+
x-size: true
597602
pattern_cache_size:
598603
type: integer
599604
x-display-name: Pattern Lookup Cache Size

test/configuration_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ global
246246
tune.h2.fe.max-total-streams 8192
247247
tune.h2.fe.rxbuf 8k
248248
tune.lua.burst-timeout 205
249+
tune.notsent-lowat.client 32k
249250
ssl-default-bind-sigalgs RSA+SHA256
250251
ssl-default-bind-client-sigalgs ECDSA+SHA256:RSA+SHA256
251252
ssl-default-server-sigalgs RSA+SHA256

test/expected/structured.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@
311311
"maxpollevents": 29,
312312
"maxrewrite": 30,
313313
"memory_hot_size": 56,
314+
"notsent_lowat_client": 32768,
314315
"pattern_cache_size": 31,
315316
"peers_max_updates_at_once": 200,
316317
"pool_high_fd_ratio": 33,

0 commit comments

Comments
 (0)