From 773c0392a7d301bf5f97006a6bf7c495c3c9b88a Mon Sep 17 00:00:00 2001 From: yangw Date: Thu, 14 Mar 2024 19:22:56 +0800 Subject: [PATCH] fix: db row close error be ignored (#2578) --- pkg/cluster/database.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/database.go b/pkg/cluster/database.go index 26e29ef56..cc203eef5 100644 --- a/pkg/cluster/database.go +++ b/pkg/cluster/database.go @@ -205,7 +205,11 @@ func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUser } defer func() { if err2 := rows.Close(); err2 != nil { - err = fmt.Errorf("error when closing query cursor: %v", err2) + if err != nil { + err = fmt.Errorf("error when closing query cursor: %v, previous error: %v", err2, err) + } else { + err = fmt.Errorf("error when closing query cursor: %v", err2) + } } }() @@ -252,7 +256,11 @@ func findUsersFromRotation(rotatedUsers []string, db *sql.DB) (map[string]string } defer func() { if err2 := rows.Close(); err2 != nil { - err = fmt.Errorf("error when closing query cursor: %v", err2) + if err != nil { + err = fmt.Errorf("error when closing query cursor: %v, previous error: %v", err2, err) + } else { + err = fmt.Errorf("error when closing query cursor: %v", err2) + } } }()