Merge pull request #27 from solarisdb/fix_db_conn_deadlock

fix the deadlock on db connection pool
solarisdb · May 7, 2024 · 17519c8 · 17519c8
2 parents 198c606 + a320b8a
commit 17519c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/storage/postgres/postgres.go b/pkg/storage/postgres/postgres.go
@@ -129,13 +129,13 @@ func (s *Storage) QueryLogs(ctx context.Context, qr storage.QueryLogsRequest) (*
 	if err != nil {
 		return nil, MapError(err)
 	}
-	defer func() {
-		_ = cntRows.Close()
-	}()
 	var count int64
 	if count, err = scan[int64](cntRows); err != nil {
+		_ = cntRows.Close()
 		return nil, MapError(err)
 	}
+	// releasing the db connection before requesting a new one for avoiding a deadlock on limited connection pool
+	_ = cntRows.Close()
 
 	limit := int(qr.Limit)
 	args = append(args, limit+1)