Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitabc4510

Browse files
committed
chore: retry postgres connection on reset by peer in tests
1 parent73c742a commitabc4510

File tree

1 file changed

+46
-15
lines changed

1 file changed

+46
-15
lines changed

‎coderd/database/dbtestutil/postgres.go

Lines changed: 46 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ var (
4545
connectionParamsInitOnce sync.Once
4646
defaultConnectionParamsConnectionParams
4747
errDefaultConnectionParamsIniterror
48+
retryableErrSubstrings= []string{
49+
"connection reset by peer",
50+
}
51+
noPostgresRunningErrSubstrings= []string{
52+
"connection refused",// nothing is listening on the port
53+
"No connection could be made",// Windows variant of the above
54+
}
4855
)
4956

5057
// initDefaultConnection initializes the default postgres connection parameters.
@@ -59,28 +66,42 @@ func initDefaultConnection(t TBSubset) error {
5966
DBName:"postgres",
6067
}
6168
dsn:=params.DSN()
62-
db,dbErr:=sql.Open("postgres",dsn)
63-
ifdbErr==nil {
64-
dbErr=db.Ping()
65-
ifcloseErr:=db.Close();closeErr!=nil {
66-
returnxerrors.Errorf("close db: %w",closeErr)
69+
70+
// Helper closure to try opening and pinging the default Postgres instance.
71+
// Used within a single retry loop that handles both retryable and permanent errors.
72+
attemptConn:=func()error {
73+
db,err:=sql.Open("postgres",dsn)
74+
iferr==nil {
75+
err=db.Ping()
76+
ifcloseErr:=db.Close();closeErr!=nil {
77+
returnxerrors.Errorf("close db: %w",closeErr)
78+
}
6779
}
80+
returnerr
6881
}
82+
83+
vardbErrerror
6984
shouldOpenContainer:=false
70-
ifdbErr!=nil {
71-
errSubstrings:= []string{
72-
"connection refused",// this happens on Linux when there's nothing listening on the port
73-
"No connection could be made",// like above but Windows
85+
// Retry up to 3 seconds for temporary errors.
86+
ctx,cancel:=context.WithTimeout(context.Background(),3*time.Second)
87+
defercancel()
88+
forr:=retry.New(10*time.Millisecond,500*time.Millisecond);r.Wait(ctx); {
89+
dbErr=attemptConn()
90+
ifdbErr==nil {
91+
break
7492
}
7593
errString:=dbErr.Error()
76-
for_,errSubstring:=rangeerrSubstrings {
77-
ifstrings.Contains(errString,errSubstring) {
78-
shouldOpenContainer=true
79-
break
80-
}
94+
if!containsAnySubstring(errString,retryableErrSubstrings) {
95+
break
8196
}
97+
t.Logf("failed to connect to postgres, retrying: %s",errString)
98+
}
99+
100+
// After the loop dbErr is the last connection error (if any).
101+
ifdbErr!=nil&&containsAnySubstring(dbErr.Error(),noPostgresRunningErrSubstrings) {
102+
shouldOpenContainer=true
82103
}
83-
ifdbErr!=nil&&shouldOpenContainer {
104+
ifshouldOpenContainer {
84105
// If there's no database running on the default port, we'll start a
85106
// postgres container. We won't be cleaning it up so it can be reused
86107
// by subsequent tests. It'll keep on running until the user terminates
@@ -110,6 +131,7 @@ func initDefaultConnection(t TBSubset) error {
110131
ifconnErr==nil {
111132
break
112133
}
134+
t.Logf("failed to connect to postgres after starting container, may retry: %s",connErr.Error())
113135
}
114136
}elseifdbErr!=nil {
115137
returnxerrors.Errorf("open postgres connection: %w",dbErr)
@@ -523,3 +545,12 @@ func OpenContainerized(t TBSubset, opts DBContainerOptions) (string, func(), err
523545

524546
returndbURL,containerCleanup,nil
525547
}
548+
549+
funccontainsAnySubstring(sstring,substrings []string)bool {
550+
for_,substr:=rangesubstrings {
551+
ifstrings.Contains(s,substr) {
552+
returntrue
553+
}
554+
}
555+
returnfalse
556+
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp