extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-06-19 00:07:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

move various timeouts to package-level variables

Browse Source
This commit is contained in:
Christian Schwarz 2018-08-25 22:30:16 +02:00
parent 88de8ba8bb
commit 71203ab325
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/config_serve_tcp.go
View File

@ -75,12 +75,14 @@ func parseTCPListenerFactory(c JobParsingContext, i map[string]interface{}) (*TC
return lf, nil return lf, nil
} }
var TCPListenerHandshakeTimeout = 10 * time.Second // FIXME make configurable
func (f *TCPListenerFactory) Listen() (net.Listener, error) { func (f *TCPListenerFactory) Listen() (net.Listener, error) {
l, err := net.Listen("tcp", f.Address) l, err := net.Listen("tcp", f.Address)
if !f.tls || err != nil { if !f.tls || err != nil {
return l, err 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 return tl, nil
} }

4
replication/fsrep/fsfsm.go
View File

@ -199,6 +199,8 @@ type updater func(func(fsr *Replication)) State
type state func(ctx context.Context, sender Sender, receiver Receiver, u updater) 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 { func stateReady(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
var current *ReplicationStep var current *ReplicationStep
@ -226,7 +228,7 @@ func stateReady(ctx context.Context, sender Sender, receiver Receiver, u updater
f.state = Completed f.state = Completed
} }
case StepRetry: case StepRetry:
f.retryWaitUntil = time.Now().Add(10 * time.Second) // FIXME make configurable f.retryWaitUntil = time.Now().Add(RetrySleepDuration)
f.state = RetryWait f.state = RetryWait
case StepPermanentError: case StepPermanentError:
f.state = PermanentError f.state = PermanentError

12
replication/mainfsm.go
View File

@ -271,12 +271,13 @@ func statePlanning(ctx context.Context, sender Sender, receiver Receiver, u upda
}).rsf() }).rsf()
} }
var RetrySleepDuration = 10 * time.Second // FIXME make constant onfigurable
func statePlanningError(ctx context.Context, sender Sender, receiver Receiver, u updater) state { func statePlanningError(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
sleepTime := 10 * time.Second
u(func(r *Replication) { 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() defer t.Stop()
select { select {
case <-ctx.Done(): 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 { func stateWorkingWait(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
sleepTime := 10 * time.Second
u(func(r *Replication) { 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() defer t.Stop()
select { select {
case <-ctx.Done(): case <-ctx.Done():