Skip to content

Commit 8943ee0

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

File tree

11 files changed

+42
-2
lines changed

11 files changed

+42
-2
lines changed

config-parser/section-parsers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
327327
addParser(parser, &sequence, &simple.Number{Name: "tune.maxrewrite"})
328328
addParser(parser, &sequence, &simple.Number{Name: "tune.memory.hot-size"})
329329
addParser(parser, &sequence, &simple.Size{Name: "tune.notsent-lowat.client"})
330+
addParser(parser, &sequence, &simple.Size{Name: "tune.notsent-lowat.server"})
330331
addParser(parser, &sequence, &simple.Number{Name: "tune.pattern.cache-size"})
331332
addParser(parser, &sequence, &simple.Number{Name: "tune.peers.max-updates-at-once"})
332333
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
@@ -57,6 +57,7 @@ global
5757
tune.h2.zero-copy-fwd-send on
5858
tune.lua.maxmem 65536
5959
tune.notsent-lowat.client 32k
60+
tune.notsent-lowat.server 16k
6061
tune.pt.zero-copy-forwarding on
6162
tune.renice.runtime -10
6263
tune.renice.startup 8

configuration/global.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,6 +1656,15 @@ func parseTuneOptions(p parser.Parser) (*models.TuneOptions, error) { //nolint:g
16561656
options.NotsentLowatClient = intPOption
16571657
}
16581658

1659+
intPOption, err = parseSizeOption(p, "tune.notsent-lowat.server")
1660+
if err != nil {
1661+
return nil, err
1662+
}
1663+
if intPOption != nil {
1664+
isEmpty = false
1665+
options.NotsentLowatServer = intPOption
1666+
}
1667+
16591668
strOption, err = parseOnOffOption(p, "tune.pt.zero-copy-forwarding")
16601669
if err != nil {
16611670
return nil, err
@@ -3866,6 +3875,9 @@ func serializeTuneOptions(p parser.Parser, options *models.TuneOptions, configOp
38663875
if err := serializeSizeOption(p, "tune.notsent-lowat.client", options.NotsentLowatClient); err != nil {
38673876
return err
38683877
}
3878+
if err := serializeSizeOption(p, "tune.notsent-lowat.server", options.NotsentLowatServer); err != nil {
3879+
return err
3880+
}
38693881
if err := serializeOnOffOption(p, "tune.pt.zero-copy-forwarding", options.PtZeroCopyForwarding); err != nil {
38703882
return err
38713883
}

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
@@ -1620,6 +1620,11 @@ definitions:
16201620
x-display-name: Client Not Sent Low Watermark
16211621
x-nullable: true
16221622
x-size: true
1623+
notsent_lowat_server:
1624+
type: integer
1625+
x-display-name: Server Not Sent Low Watermark
1626+
x-nullable: true
1627+
x-size: true
16231628
pattern_cache_size:
16241629
type: integer
16251630
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
@@ -599,6 +599,11 @@ tune_options:
599599
x-display-name: Client Not Sent Low Watermark
600600
x-nullable: true
601601
x-size: true
602+
notsent_lowat_server:
603+
type: integer
604+
x-display-name: Server Not Sent Low Watermark
605+
x-nullable: true
606+
x-size: true
602607
pattern_cache_size:
603608
type: integer
604609
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
@@ -247,6 +247,7 @@ global
247247
tune.h2.fe.rxbuf 8k
248248
tune.lua.burst-timeout 205
249249
tune.notsent-lowat.client 32k
250+
tune.notsent-lowat.server 16k
250251
ssl-default-bind-sigalgs RSA+SHA256
251252
ssl-default-bind-client-sigalgs ECDSA+SHA256:RSA+SHA256
252253
ssl-default-server-sigalgs RSA+SHA256

test/expected/structured.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@
312312
"maxrewrite": 30,
313313
"memory_hot_size": 56,
314314
"notsent_lowat_client": 32768,
315+
"notsent_lowat_server": 16384,
315316
"pattern_cache_size": 31,
316317
"peers_max_updates_at_once": 200,
317318
"pool_high_fd_ratio": 33,

0 commit comments

Comments
 (0)