status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8685 from pierresouchay/do_not_flood_logs_with_Non-server_in_server-only_area 

[BUGFIX] Avoid GetDatacenter* methods to flood Consul servers logs
This commit is contained in:
Daniel Nephin 2020-09-15 17:57:05 -04:00 committed by hashicorp-ci
parent f88600320d
commit 3ee2aa1325
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/8685.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
fixed a bug that caused logs to be flooded with `[WARN] agent.router: Non-server in server-only area`
```

24
agent/router/router.go
View File

@ -536,10 +536,13 @@ func (r *Router) GetDatacentersByDistance() ([]string, error) {
for _, m := range info.cluster.Members() {
ok, parts := metadata.IsConsulServer(m)
if !ok {
r.logger.Warn("Non-server in server-only area",
"non_server", m.Name,
"area", areaID,
)
if areaID != types.AreaLAN {
r.logger.Warn("Non-server in server-only area",
"non_server", m.Name,
"area", areaID,
"func", "GetDatacentersByDistance",
)
}
continue
}
@ -547,6 +550,7 @@ func (r *Router) GetDatacentersByDistance() ([]string, error) {
r.logger.Debug("server in area left, skipping",
"server", m.Name,
"area", areaID,
"func", "GetDatacentersByDistance",
)
continue
}
@ -607,10 +611,13 @@ func (r *Router) GetDatacenterMaps() ([]structs.DatacenterMap, error) {
for _, m := range info.cluster.Members() {
ok, parts := metadata.IsConsulServer(m)
if !ok {
r.logger.Warn("Non-server in server-only area",
"non_server", m.Name,
"area", areaID,
)
if areaID != types.AreaLAN {
r.logger.Warn("Non-server in server-only area",
"non_server", m.Name,
"area", areaID,
"func", "GetDatacenterMaps",
)
}
continue
}
@ -618,6 +625,7 @@ func (r *Router) GetDatacenterMaps() ([]structs.DatacenterMap, error) {
r.logger.Debug("server in area left, skipping",
"server", m.Name,
"area", areaID,
"func", "GetDatacenterMaps",
)
continue
}