Skip to content

Commit 2ba87e1

Browse files
committed
MINOR: global: add fd-hard-limit
1 parent 2e031e4 commit 2ba87e1

File tree

8 files changed

+33
-2
lines changed

8 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
@@ -243,6 +243,7 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
243243
addParser(parser, &sequence, &simple.Number{Name: "maxsslconn"})
244244
addParser(parser, &sequence, &simple.Number{Name: "maxsslrate"})
245245
addParser(parser, &sequence, &simple.Number{Name: "maxzlibmem"})
246+
addParser(parser, &sequence, &simple.Number{Name: "fd-hard-limit"})
246247
addParser(parser, &sequence, &simple.String{Name: "pidfile"})
247248
addParser(parser, &sequence, &parsers.Socket{})
248249
addParser(parser, &sequence, &parsers.StatsTimeout{})

configuration/configuration_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ global
135135
maxsslconn 7
136136
maxsslrate 8
137137
maxzlibmem 9
138+
fd-hard-limit 4096
138139
no-quic
139140
noepoll
140141
nokqueue

configuration/global.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,11 @@ func ParseGlobalSection(p parser.Parser) (*models.Global, error) { //nolint:goco
824824
maxzlibmem = maxzlibmemParser.Value
825825
}
826826

827+
fdHardLimit, err := parseInt64POption(p, "fd-hard-limit")
828+
if err != nil {
829+
return nil, err
830+
}
831+
827832
var noQuic bool
828833
_, err = p.Get(parser.Global, parser.GlobalSectionName, "no-quic")
829834
if !errors.Is(err, parser_errors.ErrFetch) {
@@ -1229,6 +1234,7 @@ func ParseGlobalSection(p parser.Parser) (*models.Global, error) { //nolint:goco
12291234
Maxsslconn: maxsslconn,
12301235
Maxsslrate: maxsslrate,
12311236
Maxzlibmem: maxzlibmem,
1237+
FdHardLimit: fdHardLimit,
12321238
NoQuic: noQuic,
12331239
Noepoll: noepoll,
12341240
Nokqueue: nokqueue,
@@ -1855,6 +1861,10 @@ func SerializeGlobalSection(p parser.Parser, data *models.Global) error { //noli
18551861
return err
18561862
}
18571863

1864+
if err := serializeInt64POption(p, "fd-hard-limit", data.FdHardLimit); err != nil {
1865+
return err
1866+
}
1867+
18581868
noQuic := &types.Enabled{}
18591869
if !data.NoQuic {
18601870
noQuic = nil

models/global.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/global_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/global_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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,6 +1122,9 @@ definitions:
11221122
external_check:
11231123
type: boolean
11241124
x-display-name: External Check
1125+
fd_hard_limit:
1126+
type: integer
1127+
x-nullable: true
11251128
fifty_one_degrees_options:
11261129
properties:
11271130
cache_size:

specification/models/configuration/global.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ global:
144144
maxzlibmem:
145145
type: integer
146146
x-display-name: Maximum amount of RAM in megabytes per process usable by the zlib
147+
fd_hard_limit:
148+
type: integer
149+
x-nullable: true
147150
no-quic:
148151
type: boolean
149152
x-display-name: Disable the use of the QUIC protocol

0 commit comments

Comments
 (0)