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

consul: allow stale namespace results (#12953) 

Nomad reconciles services it expects to be registered in Consul with
what is actually registered in the local Consul agent. This is necessary
to prevent leaking service registrations if Nomad crashes at certain
points (or if there are bugs).

When Consul has namespaces enabled, we must iterate over each available
namespace to be sure no services were leaked into non-default
namespaces.

Since this reconciliation happens often, there's no need to require
results from the Consul leader server. In large clusters this creates
far more load than the "freshness" of the response is worth.

Therefore this patch switches the request to AllowStale=true
This commit is contained in:
Michael Schurter 2022-08-26 16:05:12 -07:00 committed by GitHub
parent e427291d65
commit dbffe22465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12953.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
consul: Reduce load on Consul leader server by allowing stale results when listing namespaces.
```

9
command/agent/consul/namespaces_client.go
View File

@ -4,6 +4,8 @@ import (
"sort" "sort"
"sync" "sync"
"time" "time"
"github.com/hashicorp/consul/api"
) )
const ( const (
@ -66,8 +68,6 @@ func (ns *NamespacesClient) allowable(now time.Time) bool {
} }
// List returns a list of Consul Namespaces. // List returns a list of Consul Namespaces.
//
// TODO(shoenig): return empty string instead of "default" when namespaces are not enabled. (Coming in followup PR).
func (ns *NamespacesClient) List() ([]string, error) { func (ns *NamespacesClient) List() ([]string, error) {
if !ns.allowable(time.Now()) { if !ns.allowable(time.Now()) {
// TODO(shoenig): lets return the empty string instead, that way we do not // TODO(shoenig): lets return the empty string instead, that way we do not
@ -75,7 +75,10 @@ func (ns *NamespacesClient) List() ([]string, error) {
return []string{"default"}, nil return []string{"default"}, nil
} }
namespaces, _, err := ns.namespacesAPI.List(nil) qo := &api.QueryOptions{
AllowStale: true,
}
namespaces, _, err := ns.namespacesAPI.List(qo)
if err != nil { if err != nil {
return nil, err return nil, err
} }