From 615b33ac5b8c298ae1ee8185e4bc0a47f6b5377f Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Fri, 28 Apr 2023 17:57:54 +0000
Subject: [PATCH 1/2] fix(server): retry initial connection to postgres

---
 cli/server.go | 49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/cli/server.go b/cli/server.go
index 039eeecef8d0a..dcb62b9506f1d 100644
--- a/cli/server.go
+++ b/cli/server.go
@@ -88,6 +88,7 @@ import (
 	"github.com/coder/coder/provisionersdk"
 	sdkproto "github.com/coder/coder/provisionersdk/proto"
 	"github.com/coder/coder/tailnet"
+	"github.com/coder/retry"
 	"github.com/coder/wgtunnel/tunnelsdk"
 )
 
@@ -1733,26 +1734,44 @@ func BuildLogger(inv *clibase.Invocation, cfg *codersdk.DeploymentValues) (slog.
 
 func connectToPostgres(ctx context.Context, logger slog.Logger, driver string, dbURL string) (*sql.DB, error) {
 	logger.Debug(ctx, "connecting to postgresql")
-	sqlDB, err := sql.Open(driver, dbURL)
+
+	// Try to connect for 30 seconds.
+	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+	defer cancel()
+
+	var (
+		sqlDB *sql.DB
+		err   error
+		ok    = false
+		tries int
+	)
+	for r := retry.New(time.Second, 3*time.Second); r.Wait(ctx); {
+		tries++
+
+		sqlDB, err = sql.Open(driver, dbURL)
+		if err != nil {
+			logger.Warn(ctx, "connect to postgres; retrying", slog.Error(err), slog.F("try", tries))
+			continue
+		}
+
+		err = pingPostgres(ctx, sqlDB)
+		if err != nil {
+			logger.Warn(ctx, "ping postgres; retrying", slog.Error(err), slog.F("try", tries))
+			continue
+		}
+
+		break
+	}
 	if err != nil {
-		return nil, xerrors.Errorf("dial postgres: %w", err)
+		return nil, xerrors.Errorf("connect to postgres; tries %d; last error: %w", tries, err)
 	}
 
-	ok := false
 	defer func() {
-		if !ok {
+		if !ok && sqlDB != nil {
 			_ = sqlDB.Close()
 		}
 	}()
 
-	pingCtx, pingCancel := context.WithTimeout(ctx, 15*time.Second)
-	defer pingCancel()
-
-	err = sqlDB.PingContext(pingCtx)
-	if err != nil {
-		return nil, xerrors.Errorf("ping postgres: %w", err)
-	}
-
 	// Ensure the PostgreSQL version is >=13.0.0!
 	version, err := sqlDB.QueryContext(ctx, "SHOW server_version_num;")
 	if err != nil {
@@ -1799,6 +1818,12 @@ func connectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
 	return sqlDB, nil
 }
 
+func pingPostgres(ctx context.Context, db *sql.DB) error {
+	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	defer cancel()
+	return db.PingContext(ctx)
+}
+
 type HTTPServers struct {
 	HTTPUrl      *url.URL
 	HTTPListener net.Listener

From 7e9c81af3af05a507e84dcf23fec2f0bcab80404 Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Fri, 28 Apr 2023 18:17:24 +0000
Subject: [PATCH 2/2] fixup! fix(server): retry initial connection to postgres

---
 cli/server.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cli/server.go b/cli/server.go
index dcb62b9506f1d..d65560a9f88ee 100644
--- a/cli/server.go
+++ b/cli/server.go
@@ -1762,15 +1762,16 @@ func connectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
 
 		break
 	}
-	if err != nil {
-		return nil, xerrors.Errorf("connect to postgres; tries %d; last error: %w", tries, err)
-	}
-
+	// Make sure we close the DB in case it opened but the ping failed for some
+	// reason.
 	defer func() {
 		if !ok && sqlDB != nil {
 			_ = sqlDB.Close()
 		}
 	}()
+	if err != nil {
+		return nil, xerrors.Errorf("connect to postgres; tries %d; last error: %w", tries, err)
+	}
 
 	// Ensure the PostgreSQL version is >=13.0.0!
 	version, err := sqlDB.QueryContext(ctx, "SHOW server_version_num;")