From 1b22141f11c4f24cca60ad32f69a29fa704a0b42 Mon Sep 17 00:00:00 2001 From: Ibrahim Kettaneh Date: Wed, 20 Nov 2024 17:03:39 -0500 Subject: [PATCH 1/2] kvcoord: Disable follower reads for TestProxyTracing This commit disables follower reads for the test TestProxyTracing. We noticed that sometimes, the test gets slow, and by the time we issue a read request, it's served via follower reads instead of proxying it to the leaseholder. Fixes: #135493 Release note: None --- pkg/kv/kvclient/kvcoord/dist_sender_server_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go b/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go index e7d75eadaed4..097f19d6dc96 100644 --- a/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go +++ b/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go @@ -4836,6 +4836,9 @@ func TestProxyTracing(t *testing.T) { kvserver.OverrideDefaultLeaseType(ctx, &st.SV, leaseType) kvserver.RangefeedEnabled.Override(ctx, &st.SV, true) kvserver.RangeFeedRefreshInterval.Override(ctx, &st.SV, 10*time.Millisecond) + // Disable follower reads to ensure that the request is proxied, and not + // answered locally due to follower reads. + kvserver.FollowerReadsEnabled.Override(ctx, &st.SV, false) closedts.TargetDuration.Override(ctx, &st.SV, 10*time.Millisecond) closedts.SideTransportCloseInterval.Override(ctx, &st.SV, 10*time.Millisecond) From c8bc8076cee973d492d4a4d5c968d3f6d6a60e86 Mon Sep 17 00:00:00 2001 From: Stan Rosenberg Date: Thu, 21 Nov 2024 10:54:03 -0500 Subject: [PATCH 2/2] ci: fix private roachtest nightly It appears a change to TC wrapper scripts in [1] may have caused the `root` var. to become unbound. This PR adds the missing `source` statement. [1] https://github.com/cockroachdb/cockroach/pull/124592 Epic: none Release note: None --- .../internal/cockroach/nightlies/private_roachtest_impl.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/teamcity/internal/cockroach/nightlies/private_roachtest_impl.sh b/build/teamcity/internal/cockroach/nightlies/private_roachtest_impl.sh index 5f97df3853f1..5caffc129618 100755 --- a/build/teamcity/internal/cockroach/nightlies/private_roachtest_impl.sh +++ b/build/teamcity/internal/cockroach/nightlies/private_roachtest_impl.sh @@ -10,7 +10,11 @@ set -exuo pipefail dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))" +# N.B. export variables like `root` s.t. they can be used by scripts called below. +set -a source "$dir/teamcity-support.sh" +set +a + if [[ ! -f ~/.ssh/id_rsa.pub ]]; then ssh-keygen -q -C "private-roachtest-nightly-bazel $(date)" -N "" -f ~/.ssh/id_rsa fi