mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Use 10m timeouts for watches (#7423)

Browse source 
use ?wait=10m will give results as fast as usual when data is changing
but will perform far less requests when services do not change.

On large infrastructure, this will reduce quite a lot the number of
qps on Consul servers while having the same performance for freshness
of results.

Signed-off-by: Pierre Souchay <p.souchay@criteo.com>
This commit is contained in:
Pierre Souchay 2020-06-20 21:22:45 +02:00 committed by GitHub
parent fb9a1a872e
commit 1508678001
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
discovery/consul/consul.go
View file

@ -36,7 +36,7 @@ import (
) )
const ( const (
watchTimeout = 30 * time.Second watchTimeout = 10 * time.Minute
retryInterval = 15 * time.Second retryInterval = 15 * time.Second
// addressLabel is the name for the label containing a target's address. // addressLabel is the name for the label containing a target's address.
@ -95,7 +95,7 @@ var (
Scheme: "http", Scheme: "http",
Server: "localhost:8500", Server: "localhost:8500",
AllowStale: true, AllowStale: true,
RefreshInterval: model.Duration(watchTimeout), RefreshInterval: model.Duration(30 * time.Second),
} }
) )
@ -175,7 +175,7 @@ func NewDiscovery(conf *SDConfig, logger log.Logger) (*Discovery, error) {
return nil, err return nil, err
} }
transport := &http.Transport{ transport := &http.Transport{
IdleConnTimeout: 5 * time.Duration(conf.RefreshInterval), IdleConnTimeout: 2 * time.Duration(watchTimeout),
TLSClientConfig: tls, TLSClientConfig: tls,
DialContext: conntrack.NewDialContextFunc( DialContext: conntrack.NewDialContextFunc(
conntrack.DialWithTracing(), conntrack.DialWithTracing(),

14
discovery/consul/consul_test.go
View file

@ -223,20 +223,20 @@ func newServer(t *testing.T) (*httptest.Server, *SDConfig) {
switch r.URL.String() { switch r.URL.String() {
case "/v1/agent/self": case "/v1/agent/self":
response = AgentAnswer response = AgentAnswer
case "/v1/health/service/test?node-meta=rack_name%3A2304&stale=&tag=tag1&wait=30000ms": case "/v1/health/service/test?node-meta=rack_name%3A2304&stale=&tag=tag1&wait=600000ms":
response = ServiceTestAnswer response = ServiceTestAnswer
case "/v1/health/service/test?wait=30000ms": case "/v1/health/service/test?wait=600000ms":
response = ServiceTestAnswer response = ServiceTestAnswer
case "/v1/health/service/other?wait=30000ms": case "/v1/health/service/other?wait=600000ms":
response = `[]` response = `[]`
case "/v1/catalog/services?node-meta=rack_name%3A2304&stale=&wait=30000ms": case "/v1/catalog/services?node-meta=rack_name%3A2304&stale=&wait=600000ms":
response = ServicesTestAnswer response = ServicesTestAnswer
case "/v1/catalog/services?wait=30000ms": case "/v1/catalog/services?wait=600000ms":
response = ServicesTestAnswer response = ServicesTestAnswer
case "/v1/catalog/services?index=1&node-meta=rack_name%3A2304&stale=&wait=30000ms": case "/v1/catalog/services?index=1&node-meta=rack_name%3A2304&stale=&wait=600000ms":
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
response = ServicesTestAnswer response = ServicesTestAnswer
case "/v1/catalog/services?index=1&wait=30000ms": case "/v1/catalog/services?index=1&wait=600000ms":
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
response = ServicesTestAnswer response = ServicesTestAnswer
default: default: