Merge pull request #752 from sgotti/sync_timeout_disabled_by_default

cluster: make DefaultSyncTimeout infinite.
sorintlab · Jan 22, 2020 · d2f4a09 · d2f4a09
2 parents 2ae5e0f + 709a3d0
commit d2f4a09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/internal/cluster/cluster.go b/internal/cluster/cluster.go
@@ -55,7 +55,7 @@ const (
 	DefaultRequestTimeout                             = 10 * time.Second
 	DefaultConvergenceTimeout                         = 30 * time.Second
 	DefaultInitTimeout                                = 5 * time.Minute
-	DefaultSyncTimeout                                = 30 * time.Minute
+	DefaultSyncTimeout                                = 0
 	DefaultFailInterval                               = 20 * time.Second
 	DefaultDeadKeeperRemovalInterval                  = 48 * time.Hour
 	DefaultMaxStandbys               uint16           = 20

diff --git a/internal/postgresql/postgresql.go b/internal/postgresql/postgresql.go
@@ -342,7 +342,7 @@ func (p *Manager) start(args ...string) error {
 	// Wait for the correct pid file to appear or for the process to exit
 	ok := false
 	start := time.Now()
-	for time.Now().Add(-startTimeout).Before(start) {
+	for time.Since(start) < startTimeout {
 		fh, err := os.Open(filepath.Join(p.dataDir, "postmaster.pid"))
 		if err == nil {
 			scanner := bufio.NewScanner(fh)
@@ -485,7 +485,7 @@ func (p *Manager) Restart(fast bool) error {
 
 func (p *Manager) WaitReady(timeout time.Duration) error {
 	start := time.Now()
-	for time.Now().Add(-timeout).Before(start) {
+	for timeout == 0 || time.Since(start) < timeout {
 		if err := p.Ping(); err == nil {
 			return nil
 		}
@@ -502,7 +502,7 @@ func (p *Manager) WaitRecoveryDone(timeout time.Duration) error {
 
 	start := time.Now()
 	if maj >= 12 {
-		for time.Now().Add(-timeout).Before(start) {
+		for timeout == 0 || time.Since(start) < timeout {
 			_, err := os.Stat(filepath.Join(p.dataDir, postgresRecoverySignal))
 			if err != nil && !os.IsNotExist(err) {
 				return err
@@ -513,7 +513,7 @@ func (p *Manager) WaitRecoveryDone(timeout time.Duration) error {
 			time.Sleep(1 * time.Second)
 		}
 	} else {
-		for time.Now().Add(-timeout).Before(start) {
+		for timeout == 0 || time.Since(start) < timeout {
 			_, err := os.Stat(filepath.Join(p.dataDir, postgresRecoveryDone))
 			if err != nil && !os.IsNotExist(err) {
 				return err