Remove DiscoveryTimeout config option.

closes #88

client/client.go

@@ -45,7 +45,6 @@ type HTTPClient struct {
 	healthcheckEnabled bool
 	healthcheckTimeout time.Duration
 	discoveryEnabled   bool
-	discoveryTimeout   time.Duration
 
 	mu                sync.RWMutex // guards the next block
 	running           bool
@@ -91,7 +90,6 @@ func NewSimpleHTTPClient(httpClient *http.Client, urls []string) (*HTTPClient, e
 		healthcheckEnabled: false,
 		healthcheckTimeout: off,
 		discoveryEnabled:   false,
-		discoveryTimeout:   off,
 		readPreference:     Primary,
 		maxRetries:         0,
 		retrier:            NewNoRequestRetrier(httpClient),
@@ -125,7 +123,6 @@ func NewHTTPClient(options ...HTTPClientOptionF) (*HTTPClient, error) {
 		healthcheckEnabled: DefaultHealthCheckEnabled,
 		healthcheckTimeout: DefaultHealthCheckTimeout,
 		discoveryEnabled:   DefaultTopologyDiscoveryEnabled,
-		discoveryTimeout:   DefaultTopologyDiscoveryTimeout,
 		readPreference:     Primary,
 		maxRetries:         DefaultMaxRetries,
 	}

client/config.go

@@ -83,10 +83,6 @@ const (
 	// DefaultTopologyDiscoveryEnabled specifies if the discoverer is enabled by default.
 	DefaultTopologyDiscoveryEnabled = true
 
-	// DefaultTopologyDiscoveryTimeout specifies the time the discoverer waits for
-	// a response from QED.
-	DefaultTopologyDiscoveryTimeout = 2 * time.Second
-
 	// off is used to disable timeouts.
 	off = -1 * time.Second
 )
@@ -123,10 +119,6 @@ type Config struct {
 	// topology when requests fail.
 	EnableTopologyDiscovery bool
 
-	// DiscoveryTimeout is the timeout in seconds the discoverer waits for a response
-	// from a QED server.
-	DiscoveryTimeout time.Duration
-
 	// EnableHealthChecks enables helthchecks of all endpoints in the current cluster topology.
 	EnableHealthChecks bool
 
@@ -152,7 +144,6 @@ func DefaultConfig() *Config {
 		MaxRetries:               DefaultMaxRetries,
 		EnableTopologyDiscovery:  DefaultTopologyDiscoveryEnabled,
 		EnableHealthChecks:       DefaultHealthCheckEnabled,
-		DiscoveryTimeout:         DefaultTopologyDiscoveryTimeout,
 		HealthCheckTimeout:       DefaultHealthCheckTimeout,
 		AttemptToReviveEndpoints: false,
 	}

client/options.go

@@ -35,7 +35,6 @@ func configToOptions(conf *Config) ([]HTTPClientOptionF, error) {
 			SetReadPreference(conf.ReadPreference),
 			SetMaxRetries(conf.MaxRetries),
 			SetTopologyDiscovery(conf.EnableTopologyDiscovery),
-			SetDiscoveryTimeout(conf.DiscoveryTimeout),
 			SetHealthchecks(conf.EnableHealthChecks),
 			SetHealthCheckTimeout(conf.HealthCheckTimeout),
 			SetAttemptToReviveEndpoints(conf.AttemptToReviveEndpoints),
@@ -126,13 +125,6 @@ func SetTopologyDiscovery(enable bool) HTTPClientOptionF {
 	}
 }
 
-func SetDiscoveryTimeout(seconds time.Duration) HTTPClientOptionF {
-	return func(c *HTTPClient) error {
-		c.discoveryTimeout = seconds
-		return nil
-	}
-}
-
 func SetHealthchecks(enable bool) HTTPClientOptionF {
 	return func(c *HTTPClient) error {
 		c.healthcheckEnabled = enable