Skip to content

Commit 773c039

Browse files
authored
fix: db row close error be ignored (#2578)
1 parent 6653b8f commit 773c039

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

pkg/cluster/database.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,11 @@ func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUser
205205
}
206206
defer func() {
207207
if err2 := rows.Close(); err2 != nil {
208-
err = fmt.Errorf("error when closing query cursor: %v", err2)
208+
if err != nil {
209+
err = fmt.Errorf("error when closing query cursor: %v, previous error: %v", err2, err)
210+
} else {
211+
err = fmt.Errorf("error when closing query cursor: %v", err2)
212+
}
209213
}
210214
}()
211215

@@ -252,7 +256,11 @@ func findUsersFromRotation(rotatedUsers []string, db *sql.DB) (map[string]string
252256
}
253257
defer func() {
254258
if err2 := rows.Close(); err2 != nil {
255-
err = fmt.Errorf("error when closing query cursor: %v", err2)
259+
if err != nil {
260+
err = fmt.Errorf("error when closing query cursor: %v, previous error: %v", err2, err)
261+
} else {
262+
err = fmt.Errorf("error when closing query cursor: %v", err2)
263+
}
256264
}
257265
}()
258266

0 commit comments

Comments
 (0)