Skip to content

Commit c088020

Browse files
vgramermjuraga
authored andcommitted
MINOR: global: add experimental shm-stats-file option
Signed-off-by: Vincent Gramer <vgramer@haproxy.com>
1 parent 9792679 commit c088020

12 files changed

Lines changed: 50 additions & 2 deletions

File tree

.aspell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ allowed:
166166
- scrollbar
167167
- scss
168168
- searchselect
169+
- shm
169170
- sig
170171
- sni
171172
- spammy

config-parser/section-parsers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
479479
addParser(parser, &sequence, &simple.Word{Name: "dns-accept-family"})
480480
addParser(parser, &sequence, &simple.Word{Name: "acme.scheduler"})
481481
addParser(parser, &sequence, &simple.Number{Name: "stress-level"})
482+
addParser(parser, &sequence, &simple.Word{Name: "shm-stats-file"})
482483
// the ConfigSnippet must be at the end to parsers load order to ensure
483484
// the overloading of any option has been declared previously
484485
addParser(parser, &sequence, &parsers.ConfigSnippet{})

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ global
7373
force-cfg-parser-pause 1s
7474
warn-blocked-traffic-after 50ms
7575
dns-accept-family ipv4,ipv6
76+
shm-stats-file some_file
7677
# random comment before snippet
7778
###_config-snippet_### BEGIN
7879
tune.ssl.default-dh-param 2048

configuration/global.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,6 +2325,12 @@ func ParseGlobalSection(p parser.Parser) (*models.Global, error) { //nolint:goco
23252325
}
23262326
global.DNSAcceptFamily = dnsAcceptFamily
23272327

2328+
shmStatsFile, err := parseStringOption(p, "shm-stats-file")
2329+
if err != nil {
2330+
return nil, err
2331+
}
2332+
global.ShmStatsFile = shmStatsFile
2333+
23282334
envOptions, err := parseEnvironmentOptions(p)
23292335
if err != nil {
23302336
return nil, err
@@ -3235,6 +3241,10 @@ func SerializeGlobalSection(p parser.Parser, data *models.Global, opt *options.C
32353241
return err
32363242
}
32373243

3244+
if err := serializeStringOption(p, "shm-stats-file", data.ShmStatsFile); err != nil {
3245+
return err
3246+
}
3247+
32383248
if err := serializeStringOption(p, "description", data.Description); err != nil {
32393249
return err
32403250
}

models/global_base.go

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

models/global_base_compare_test.go

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

models/globalbase_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/globalbase_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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,6 +2541,10 @@ definitions:
25412541
type: string
25422542
x-display-name: OS Capabilities
25432543
x-omitempty: true
2544+
shm_stats_file:
2545+
pattern: ^[^\s]+$
2546+
type: string
2547+
x-display-name: Shared Memory Statistics File (EXPERIMENTAL)
25442548
ssl_options:
25452549
$ref: '#/definitions/ssl_options'
25462550
stats_file:

specification/models/configuration/global.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,10 @@ global_base:
367367
pattern: ^[^\s]+$
368368
type: string
369369
x-display-name: DNS accept family
370+
shm_stats_file:
371+
type: string
372+
pattern: '^[^\s]+$'
373+
x-display-name: Shared Memory Statistics File (EXPERIMENTAL)
370374
environment_options:
371375
$ref: "#/definitions/environment_options"
372376
performance_options:

0 commit comments

Comments
 (0)