diff --git a/daemon/job/active.go b/daemon/job/active.go index ce508ce..b3315c2 100644 --- a/daemon/job/active.go +++ b/daemon/job/active.go @@ -289,7 +289,7 @@ func (j *ActiveSide) do(ctx context.Context) { // and the sequential code above transitions to the next state. go func() { - wdto := envconst.Duration("ZREPL_JOB_WATCHDOG_TIMEOUT", 1*time.Minute) + wdto := envconst.Duration("ZREPL_JOB_WATCHDOG_TIMEOUT", 10*time.Minute) jitter := envconst.Duration("ZREPL_JOB_WATCHDOG_JITTER", 1*time.Second) // shadowing! log := log.WithField("watchdog_timeout", wdto.String()) diff --git a/daemon/pruner/pruner.go b/daemon/pruner/pruner.go index 56cdba2..872e3ca 100644 --- a/daemon/pruner/pruner.go +++ b/daemon/pruner/pruner.go @@ -117,7 +117,7 @@ func NewPrunerFactory(in config.PruningSenderReceiver, promPruneSecs *prometheus f := &PrunerFactory{ senderRules: keepRulesSender, receiverRules: keepRulesReceiver, - retryWait: envconst.Duration("ZREPL_PRUNER_RETRY_INTERVAL", 4 * time.Second), + retryWait: envconst.Duration("ZREPL_PRUNER_RETRY_INTERVAL", 10 * time.Second), considerSnapAtCursorReplicated: considerSnapAtCursorReplicated, promPruneSecs: promPruneSecs, } diff --git a/replication/mainfsm.go b/replication/mainfsm.go index 0372226..7a5ba12 100644 --- a/replication/mainfsm.go +++ b/replication/mainfsm.go @@ -194,7 +194,7 @@ func resolveConflict(conflict error) (path []*pdu.FilesystemVersion, msg string) return nil, "no automated way to handle conflict type" } -var RetryInterval = envconst.Duration("ZREPL_REPLICATION_RETRY_INTERVAL", 4 * time.Second) +var RetryInterval = envconst.Duration("ZREPL_REPLICATION_RETRY_INTERVAL", 10 * time.Second) type Error interface { error