Skip to content

Commit

Permalink
Merge pull request #108945 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-23.1-108924

release-23.1: logictest: avoid FATAL during cleanup
  • Loading branch information
rafiss authored Aug 23, 2023
2 parents 63779ee + a46a79a commit 749da7d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/sql/logictest/logic.go
Original file line number Diff line number Diff line change
Expand Up @@ -3828,10 +3828,10 @@ func (t *logicTest) validateAfterTestCompletion() error {
if user == username.RootUser {
continue
}
for i, c := range userClients {
if err := c.Close(); err != nil {
t.Fatalf("failed to close connection to node %d for user %s: %v", i, user, err)
}
for _, c := range userClients {
// Ignore the error from closing the connection. This may not succeed if,
// for example, CANCEL SESSION was called on one of the sessions.
_ = c.Close()
}
delete(t.clients, user)
}
Expand Down

0 comments on commit 749da7d

Please sign in to comment.