From e1f9816a3333859e9d07e20df8aa79bd55017423 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 2 Jul 2020 22:50:32 +0200 Subject: [PATCH] Openstack: Reduce timeouts (#7507) Set saner values for openstack timeouts Signed-off-by: Julien Pivotto --- discovery/openstack/openstack.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/discovery/openstack/openstack.go b/discovery/openstack/openstack.go index 6f35566e60..38f02904a8 100644 --- a/discovery/openstack/openstack.go +++ b/discovery/openstack/openstack.go @@ -53,7 +53,7 @@ type SDConfig struct { ApplicationCredentialSecret config_util.Secret `yaml:"application_credential_secret"` Role Role `yaml:"role"` Region string `yaml:"region"` - RefreshInterval model.Duration `yaml:"refresh_interval,omitempty"` + RefreshInterval model.Duration `yaml:"refresh_interval"` Port int `yaml:"port"` AllTenants bool `yaml:"all_tenants,omitempty"` TLSConfig config_util.TLSConfig `yaml:"tls_config,omitempty"` @@ -163,14 +163,14 @@ func newRefresher(conf *SDConfig, l log.Logger) (refresher, error) { } client.HTTPClient = http.Client{ Transport: &http.Transport{ - IdleConnTimeout: 5 * time.Duration(conf.RefreshInterval), + IdleConnTimeout: 2 * time.Duration(conf.RefreshInterval), TLSClientConfig: tls, DialContext: conntrack.NewDialContextFunc( conntrack.DialWithTracing(), conntrack.DialWithName("openstack_sd"), ), }, - Timeout: 5 * time.Duration(conf.RefreshInterval), + Timeout: time.Duration(conf.RefreshInterval), } availability := gophercloud.Availability(conf.Availability) switch conf.Role {