Merge pull request #107625 from kvoli/backport23.1-107507

cockroachdb · Aug 7, 2023 · 4bc18b6 · 4bc18b6
2 parents aad4fd4 + dc05a48
commit 4bc18b6
Show file tree

Hide file tree

Showing 11 changed files with 673 additions and 33 deletions.
diff --git a/pkg/cmd/roachtest/tests/BUILD.bazel b/pkg/cmd/roachtest/tests/BUILD.bazel
@@ -80,6 +80,7 @@ go_library(
         "kv.go",
         "kvbench.go",
         "latency_verifier.go",
+        "lease_preferences.go",
         "ledger.go",
         "libpq.go",
         "libpq_blocklist.go",

diff --git a/pkg/cmd/roachtest/tests/failover.go b/pkg/cmd/roachtest/tests/failover.go
@@ -1598,7 +1598,9 @@ func nodeMetric(
 	ctx context.Context, t test.Test, c cluster.Cluster, node int, metric string,
 ) float64 {
 	var value float64
-	err := c.Conn(ctx, t.L(), node).QueryRowContext(
+	conn := c.Conn(ctx, t.L(), node)
+	defer conn.Close()
+	err := conn.QueryRowContext(
 		ctx, `SELECT value FROM crdb_internal.node_metrics WHERE name = $1`, metric).Scan(&value)
 	require.NoError(t, err)
 	return value