Skip to content

Commit a32440f

Browse files
committed
drt: fix potential db conn leaks
Close `rows` from `conn.QueryContext` added in [1] and [2]. [1] #144365 [2] #144367 Epic: none Release note: None
1 parent 6e67e13 commit a32440f

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

pkg/cmd/roachtest/operations/cancel_job.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ func runCancelJob(
3535
o.Fatal(err)
3636
}
3737

38+
defer rows.Close()
39+
3840
var jobIds []string
3941
for rows.Next() {
4042
var jobId string

pkg/cmd/roachtest/operations/pause_job.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ func runPauseJob(
5454
o.Fatal(err)
5555
}
5656

57+
defer rows.Close()
58+
5759
var jobIds []string
5860
for rows.Next() {
5961
var jobId string

pkg/cmd/roachtest/roachtestutil/operations/dependency.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ func checkPopulatedDatabase(
8181
if err != nil {
8282
return false, err
8383
}
84+
defer dbsCount.Close()
85+
8486
dbsCount.Next()
8587
var count int
8688
if err := dbsCount.Scan(&count); err != nil {
@@ -99,6 +101,8 @@ func checkZeroUnavailableRanges(
99101
if err != nil {
100102
return false, err
101103
}
104+
defer rangesCur.Close()
105+
102106
rangesCur.Next()
103107
var count int
104108
if err := rangesCur.Scan(&count); err != nil {
@@ -117,6 +121,8 @@ func checkZeroUnderreplicatedRanges(
117121
if err != nil {
118122
return false, err
119123
}
124+
defer rangesCur.Close()
125+
120126
rangesCur.Next()
121127
var count int
122128
if err := rangesCur.Scan(&count); err != nil {
@@ -135,6 +141,8 @@ func checkLDRJobRunning(
135141
if err != nil {
136142
return false, err
137143
}
144+
defer jobsCur.Close()
145+
138146
jobsCur.Next()
139147
var jobId string
140148
_ = jobsCur.Scan(&jobId)
@@ -152,6 +160,8 @@ func checkBackupJobRunning(
152160
if err != nil {
153161
return false, err
154162
}
163+
defer jobsCur.Close()
164+
155165
jobsCur.Next()
156166
var jobId string
157167
_ = jobsCur.Scan(&jobId)
@@ -169,6 +179,8 @@ func checkRestoreJobRunning(
169179
if err != nil {
170180
return false, err
171181
}
182+
defer jobsCur.Close()
183+
172184
jobsCur.Next()
173185
var jobId string
174186
_ = jobsCur.Scan(&jobId)

0 commit comments

Comments
 (0)