From 71203ab325ea4ce55e2f6889fce995d606f5a9af Mon Sep 17 00:00:00 2001
From: Christian Schwarz <me@cschwarz.com>
Date: Sat, 25 Aug 2018 22:30:16 +0200
Subject: [PATCH] move various timeouts to package-level variables

---
 cmd/config_serve_tcp.go    |  4 +++-
 replication/fsrep/fsfsm.go |  4 +++-
 replication/mainfsm.go     | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cmd/config_serve_tcp.go b/cmd/config_serve_tcp.go
index bfc4c49..c3c1785 100644
--- a/cmd/config_serve_tcp.go
+++ b/cmd/config_serve_tcp.go
@@ -75,12 +75,14 @@ func parseTCPListenerFactory(c JobParsingContext, i map[string]interface{}) (*TC
 	return lf, nil
 }
 
+var TCPListenerHandshakeTimeout = 10 * time.Second // FIXME make configurable
+
 func (f *TCPListenerFactory) Listen() (net.Listener, error) {
 	l, err := net.Listen("tcp", f.Address)
 	if !f.tls || err != nil {
 		return l, err
 	}
 
-	tl := tlsconf.NewClientAuthListener(l, f.clientCA, f.serverCert, f.clientCommonName, 10*time.Second)
+	tl := tlsconf.NewClientAuthListener(l, f.clientCA, f.serverCert, f.clientCommonName, TCPListenerHandshakeTimeout)
 	return tl, nil
 }
diff --git a/replication/fsrep/fsfsm.go b/replication/fsrep/fsfsm.go
index d542456..025cbb1 100644
--- a/replication/fsrep/fsfsm.go
+++ b/replication/fsrep/fsfsm.go
@@ -199,6 +199,8 @@ type updater func(func(fsr *Replication)) State
 
 type state func(ctx context.Context, sender Sender, receiver Receiver, u updater) state
 
+var RetrySleepDuration = 10 * time.Second // FIXME make configurable
+
 func stateReady(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
 
 	var current *ReplicationStep
@@ -226,7 +228,7 @@ func stateReady(ctx context.Context, sender Sender, receiver Receiver, u updater
 				f.state = Completed
 			}
 		case StepRetry:
-			f.retryWaitUntil = time.Now().Add(10 * time.Second) // FIXME make configurable
+			f.retryWaitUntil = time.Now().Add(RetrySleepDuration)
 			f.state = RetryWait
 		case StepPermanentError:
 			f.state = PermanentError
diff --git a/replication/mainfsm.go b/replication/mainfsm.go
index 68fefc4..4a5abcf 100644
--- a/replication/mainfsm.go
+++ b/replication/mainfsm.go
@@ -271,12 +271,13 @@ func statePlanning(ctx context.Context, sender Sender, receiver Receiver, u upda
 	}).rsf()
 }
 
+var RetrySleepDuration = 10 * time.Second // FIXME make constant onfigurable
+
 func statePlanningError(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
-	sleepTime := 10 * time.Second
 	u(func(r *Replication) {
-		r.sleepUntil = time.Now().Add(sleepTime)
+		r.sleepUntil = time.Now().Add(RetrySleepDuration)
 	})
-	t := time.NewTimer(sleepTime) // FIXME make constant onfigurable
+	t := time.NewTimer(RetrySleepDuration)
 	defer t.Stop()
 	select {
 	case <-ctx.Done():
@@ -317,11 +318,10 @@ func stateWorking(ctx context.Context, sender Sender, receiver Receiver, u updat
 }
 
 func stateWorkingWait(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
-	sleepTime := 10 * time.Second
 	u(func(r *Replication) {
-		r.sleepUntil = time.Now().Add(sleepTime)
+		r.sleepUntil = time.Now().Add(RetrySleepDuration)
 	})
-	t := time.NewTimer(sleepTime)
+	t := time.NewTimer(RetrySleepDuration)
 	defer t.Stop()
 	select {
 	case <-ctx.Done():