Added dial timeout to etcdutil

mailgun · Aug 7, 2018 · 3df4eb4 · 3df4eb4
1 parent f5cc693
commit 3df4eb4
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/etcdutil/config.go b/etcdutil/config.go
@@ -10,6 +10,7 @@ import (
 	"github.com/mailgun/holster"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/grpclog"
+	"time"
 )
 
 const (
@@ -59,6 +60,18 @@ func NewEtcdConfig(cfg *etcd.Config) (*etcd.Config, error) {
 	holster.SetDefault(&tlsKeyFile, os.Getenv("ETCD3_TLS_KEY"), ifExists(pathToKey))
 	holster.SetDefault(&tlsCaFile, os.Getenv("ETCD3_CA"), ifExists(pathToCA))
 
+	// Default to 5 second timeout, else connections hang indefinitely
+	holster.SetDefault(&cfg.DialTimeout, time.Second*5)
+	// Or if the user provided a timeout
+	if timeout := os.Getenv("ETCD3_DIAL_TIMEOUT"); timeout != "" {
+		duration, err := time.ParseDuration(timeout)
+		if err != nil {
+			return nil, errors.Errorf(
+				"ETCD3_DIAL_TIMEOUT='%s' is not a duration (1m|15s|24h): %s", timeout, err)
+		}
+		cfg.DialTimeout = duration
+	}
+
 	// If the CA file was provided
 	if tlsCaFile != "" {
 		holster.SetDefault(&cfg.TLS, &tls.Config{})