Skip to content

Commit 7eae165

Browse files
committed
MINOR: global: add fd-hard-limit
1 parent 7e30b66 commit 7eae165

File tree

10 files changed

+33
-2
lines changed

10 files changed

+33
-2
lines changed

config-parser/section-parsers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
264264
addParser(parser, &sequence, &simple.Number{Name: "maxsslconn"})
265265
addParser(parser, &sequence, &simple.Number{Name: "maxsslrate"})
266266
addParser(parser, &sequence, &simple.Number{Name: "maxzlibmem"})
267+
addParser(parser, &sequence, &simple.Number{Name: "fd-hard-limit"})
267268
addParser(parser, &sequence, &simple.String{Name: "pidfile"})
268269
addParser(parser, &sequence, &parsers.Socket{})
269270
addParser(parser, &sequence, &parsers.StatsTimeout{})

configuration/global.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,15 @@ func parsePerformanceOptions(p parser.Parser) (*models.PerformanceOptions, error
466466
options.Maxzlibmem = maxzlibmem
467467
}
468468

469+
fdHardLimit, err := parseInt64POption(p, "fd-hard-limit")
470+
if err != nil {
471+
return nil, err
472+
}
473+
if fdHardLimit != nil {
474+
isEmpty = false
475+
options.FdHardLimit = fdHardLimit
476+
}
477+
469478
noepoll, err := parseBoolOption(p, "noepoll")
470479
if err != nil {
471480
return nil, err
@@ -3060,6 +3069,10 @@ func serializePerformanceOptions(p parser.Parser, options *models.PerformanceOpt
30603069
return err
30613070
}
30623071

3072+
if err := serializeInt64POption(p, "fd-hard-limit", options.FdHardLimit); err != nil {
3073+
return err
3074+
}
3075+
30633076
if err := serializeBoolOption(p, "noepoll", options.Noepoll); err != nil {
30643077
return err
30653078
}

models/performance_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/performance_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.

models/performanceoptions_diff_generated.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/performanceoptions_equal_generated.go

Lines changed: 1 addition & 0 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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,9 @@ definitions:
13631363
properties:
13641364
busy_polling:
13651365
type: boolean
1366+
fd_hard_limit:
1367+
type: integer
1368+
x-nullable: true
13661369
max_spread_checks:
13671370
minimum: 0
13681371
type: integer

specification/models/configuration/global.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,9 @@ performance_options:
11351135
x-nullable: true
11361136
x-duration: true
11371137
x-default-unit: ms
1138+
fd_hard_limit:
1139+
type: integer
1140+
x-nullable: true
11381141
maxconn:
11391142
type: integer
11401143
x-display-name: Max Connections

test/configuration_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ global
276276
log 127.0.0.1:10002 sample 2:4 local0
277277
harden.reject-privileged-ports.tcp on
278278
profiling.tasks enabled
279+
fd-hard-limit 4096
279280
thread-hard-limit 77
280281
ssl-security-level 3
281282
http-err-codes 400,402-444,446-480,490 -450 +500

test/expected/structured.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"server_state_base": "/path",
4141
"server_state_file": "serverstatefile",
4242
"spread_checks": 10,
43+
"fd_hard_limit": 4096,
4344
"thread_hard_limit": 77,
4445
"noktls": true
4546
},

0 commit comments

Comments
 (0)