Skip to content

Commit

Permalink
sql/opt: deflake TestExecBuild/autocommit
Browse files Browse the repository at this point in the history 
Fixes #103772.

The test became flaky after 3fc29ad, which causes intent resolution to
end up in foreground requests' traces.

Release note: None
  • Loading branch information
@nvanbenschoten
nvanbenschoten committed May 23, 2023
1 parent b97a7b3 commit 1f16ff2
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions pkg/sql/opt/exec/execbuilder/testdata/autocommit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 CPut, 1 EndTxn to (n1,s1):1

Expand All @@ -65,6 +66,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 2 CPut, 1 EndTxn to (n1,s1):1

Expand All @@ -89,6 +91,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 2 CPut to (n1,s1):1

Expand All @@ -115,6 +118,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 2 CPut, 1 EndTxn to (n1,s1):1

Expand All @@ -137,6 +141,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 2 CPut, 1 EndTxn to (n1,s1):1
Expand All @@ -162,6 +167,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 2 CPut to (n1,s1):1
Expand Down Expand Up @@ -201,6 +207,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 Put, 1 EndTxn to (n1,s1):1

Expand All @@ -224,6 +231,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 2 Put, 1 EndTxn to (n1,s1):1

Expand All @@ -248,6 +256,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 2 Put to (n1,s1):1

Expand All @@ -274,6 +283,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 2 Put, 1 EndTxn to (n1,s1):1

Expand All @@ -297,6 +307,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 2 Put to (n1,s1):1
Expand All @@ -323,6 +334,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 2 Put to (n1,s1):1
Expand Down Expand Up @@ -362,6 +374,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
dist sender send r63: sending batch 2 Put, 1 EndTxn to (n1,s1):1
Expand All @@ -387,6 +400,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
dist sender send r63: sending batch 2 Put to (n1,s1):1
Expand Down Expand Up @@ -414,6 +428,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
dist sender send r63: sending batch 2 Put, 1 EndTxn to (n1,s1):1
Expand All @@ -438,6 +453,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
Expand Down Expand Up @@ -465,6 +481,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
Expand Down Expand Up @@ -505,6 +522,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 Del, 1 EndTxn to (n1,s1):1

Expand All @@ -528,6 +546,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 DelRng, 1 EndTxn to (n1,s1):1

Expand All @@ -552,6 +571,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 DelRng to (n1,s1):1

Expand All @@ -578,6 +598,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
dist sender send r63: sending batch 2 Del, 1 EndTxn to (n1,s1):1
Expand All @@ -602,6 +623,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
Expand Down Expand Up @@ -629,6 +651,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
Expand Down Expand Up @@ -680,6 +703,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 2 CPut to (n1,s1):1
Expand All @@ -705,6 +729,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 1 Scan to (n1,s1):1
Expand Down Expand Up @@ -732,6 +757,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 1 Get to (n1,s1):1
Expand Down Expand Up @@ -765,6 +791,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 1 Del to (n1,s1):1
Expand Down Expand Up @@ -797,6 +824,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 2 CPut to (n1,s1):1
Expand Down Expand Up @@ -824,6 +852,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
AND operation NOT LIKE '%async%'
----
dist sender send r63: sending batch 2 CPut to (n1,s1):1
Expand Down Expand Up @@ -860,6 +889,7 @@ SELECT operation, message FROM [SHOW KV TRACE FOR SESSION]
WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
AND message NOT LIKE '%ResolveIntent%'
----
dist sender send r63: sending batch 1 CPut, 1 EndTxn to (n1,s1):1

Expand Down

0 comments on commit 1f16ff2

Please sign in to comment.