luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

[sync ent] increase segment max limit to 4*64, make configurable (#1424) (#11795) 

* commit b6eb27563e747a78b7647d2b5da405e46364cc46
Author: FFMMM <FFMMM@users.noreply.github.com>
Date:   Thu Dec 9 13:53:44 2021 -0800

    increase segment max limit to 4*64, make configurable (#1424)

    Signed-off-by: FFMMM <FFMMM@users.noreply.github.com>

* fix: rename ent changelog file

Signed-off-by: FFMMM <FFMMM@users.noreply.github.com>
This commit is contained in:
FFMMM 2021-12-09 15:36:11 -08:00 committed by GitHub
parent 357eea6155
commit 336a234927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/_1424.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:feature
networking: **(Enterprise Only)** Make `segment_limit` configurable, cap at 256.
```

2
agent/config/builder.go
View File

@ -817,7 +817,6 @@ func (b *builder) build() (rt RuntimeConfig, err error) {
CheckDeregisterIntervalMin: b.durationVal("check_deregister_interval_min", c.CheckDeregisterIntervalMin), CheckDeregisterIntervalMin: b.durationVal("check_deregister_interval_min", c.CheckDeregisterIntervalMin),
CheckReapInterval: b.durationVal("check_reap_interval", c.CheckReapInterval), CheckReapInterval: b.durationVal("check_reap_interval", c.CheckReapInterval),
Revision: stringVal(c.Revision), Revision: stringVal(c.Revision),
SegmentLimit: intVal(c.SegmentLimit),
SegmentNameLimit: intVal(c.SegmentNameLimit), SegmentNameLimit: intVal(c.SegmentNameLimit),
SyncCoordinateIntervalMin: b.durationVal("sync_coordinate_interval_min", c.SyncCoordinateIntervalMin), SyncCoordinateIntervalMin: b.durationVal("sync_coordinate_interval_min", c.SyncCoordinateIntervalMin),
SyncCoordinateRateTarget: float64Val(c.SyncCoordinateRateTarget), SyncCoordinateRateTarget: float64Val(c.SyncCoordinateRateTarget),
@ -1058,6 +1057,7 @@ func (b *builder) build() (rt RuntimeConfig, err error) {
RetryJoinWAN: b.expandAllOptionalAddrs("retry_join_wan", c.RetryJoinWAN), RetryJoinWAN: b.expandAllOptionalAddrs("retry_join_wan", c.RetryJoinWAN),
SegmentName: stringVal(c.SegmentName), SegmentName: stringVal(c.SegmentName),
Segments: segments, Segments: segments,
SegmentLimit: intVal(c.SegmentLimit),
SerfAdvertiseAddrLAN: serfAdvertiseAddrLAN, SerfAdvertiseAddrLAN: serfAdvertiseAddrLAN,
SerfAdvertiseAddrWAN: serfAdvertiseAddrWAN, SerfAdvertiseAddrWAN: serfAdvertiseAddrWAN,
SerfAllowedCIDRsLAN: serfAllowedCIDRSLAN, SerfAllowedCIDRsLAN: serfAllowedCIDRSLAN,

7
agent/config/default.go
View File

@ -49,6 +49,10 @@ func DefaultSource() Source {
protocol = ` + strconv.Itoa(consul.DefaultRPCProtocol) + ` protocol = ` + strconv.Itoa(consul.DefaultRPCProtocol) + `
retry_interval = "30s" retry_interval = "30s"
retry_interval_wan = "30s" retry_interval_wan = "30s"
# segment_limit is the maximum number of network segments that may be declared. Default 64 is highly encouraged
segment_limit = 64
server = false server = false
syslog_facility = "LOCAL0" syslog_facility = "LOCAL0"
tls_min_version = "tls12" tls_min_version = "tls12"
@ -185,9 +189,6 @@ func NonUserSource() Source {
sync_coordinate_rate_target = 64 sync_coordinate_rate_target = 64
sync_coordinate_interval_min = "15s" sync_coordinate_interval_min = "15s"
# segment_limit is the maximum number of network segments that may be declared.
segment_limit = 64
# SegmentNameLimit is the maximum segment name length. # SegmentNameLimit is the maximum segment name length.
segment_name_limit = 64 segment_name_limit = 64

3
agent/config/runtime_test.go
View File

@ -4416,6 +4416,7 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
rt.HTTPSHandshakeTimeout = 5 * time.Second rt.HTTPSHandshakeTimeout = 5 * time.Second
rt.HTTPMaxConnsPerClient = 200 rt.HTTPMaxConnsPerClient = 200
rt.RPCMaxConnsPerClient = 100 rt.RPCMaxConnsPerClient = 100
rt.SegmentLimit = 64
}, },
}) })
@ -5308,7 +5309,6 @@ func TestLoad_FullConfig(t *testing.T) {
AEInterval: time.Minute, AEInterval: time.Minute,
CheckDeregisterIntervalMin: time.Minute, CheckDeregisterIntervalMin: time.Minute,
CheckReapInterval: 30 * time.Second, CheckReapInterval: 30 * time.Second,
SegmentLimit: 64,
SegmentNameLimit: 64, SegmentNameLimit: 64,
SyncCoordinateIntervalMin: 15 * time.Second, SyncCoordinateIntervalMin: 15 * time.Second,
SyncCoordinateRateTarget: 64, SyncCoordinateRateTarget: 64,
@ -5631,6 +5631,7 @@ func TestLoad_FullConfig(t *testing.T) {
RetryJoinMaxAttemptsWAN: 23160, RetryJoinMaxAttemptsWAN: 23160,
RetryJoinWAN: []string{"PFsR02Ye", "rJdQIhER"}, RetryJoinWAN: []string{"PFsR02Ye", "rJdQIhER"},
RPCConfig: consul.RPCConfig{EnableStreaming: true}, RPCConfig: consul.RPCConfig{EnableStreaming: true},
SegmentLimit: 123,
SerfPortLAN: 8301, SerfPortLAN: 8301,
SerfPortWAN: 8302, SerfPortWAN: 8302,
ServerMode: true, ServerMode: true,

1
agent/config/testdata/full-config.hcl vendored
View File

@ -345,6 +345,7 @@ retry_max_wan = 23160
rpc { rpc {
enable_streaming = true enable_streaming = true
} }
segment_limit = 123
serf_lan = "99.43.63.15" serf_lan = "99.43.63.15"
serf_wan = "67.88.33.19" serf_wan = "67.88.33.19"
server = true server = true

1
agent/config/testdata/full-config.json vendored
View File

@ -341,6 +341,7 @@
"retry_max": 913, "retry_max": 913,
"retry_max_wan": 23160, "retry_max_wan": 23160,
"rpc": {"enable_streaming": true}, "rpc": {"enable_streaming": true},
"segment_limit": 123,
"serf_lan": "99.43.63.15", "serf_lan": "99.43.63.15",
"serf_wan": "67.88.33.19", "serf_wan": "67.88.33.19",
"server": true, "server": true,