Merge #135913 #135921

135913: ci: fix private roachtest nightly r=darrylwong a=srosenberg 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] #124592 Epic: none Release note: None 135921: kvcoord: Disable follower reads for TestProxyTracing r=iskettaneh a=iskettaneh 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 Co-authored-by: Stan Rosenberg <[email protected]> Co-authored-by: Ibrahim Kettaneh <[email protected]>
cockroachdb · Nov 21, 2024 · a9e35d9 · a9e35d9
3 parents 00e5bc3 + c8bc807 + 1b22141
commit a9e35d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git 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

diff --git 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)