mirror of
https://github.com/zrepl/zrepl.git
synced 2025-06-18 15:56:45 +02:00
move various timeouts to package-level variables
This commit is contained in:
parent
88de8ba8bb
commit
71203ab325
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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():
|
||||
|
Loading…
x
Reference in New Issue
Block a user