Skip to content

Commit

Permalink
Merge #59431
Browse files Browse the repository at this point in the history 
59431: tracing: revert trace.mode default to legacy r=irfansharif a=tbg

We are still seeing memory issues on tpccbench/nodes=6/cpu=16/multi-az
which need to be investigated.

Turn off background tracing while we do.

Touches #58298.

Release note: None


Co-authored-by: Tobias Grieger <tobias.b.grieger@gmail.com>
  • Loading branch information
@tbg
craig[bot] and tbg committed Jan 26, 2021
2 parents 3db4737 + 7bd8a7c commit cc12bbc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 29 deletions.
28 changes: 0 additions & 28 deletions pkg/sql/opt/exec/execbuilder/testdata/autocommit_nonmetamorphic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut, 1 EndTxn to (n1,s1):1

# TODO(radu): allow non-side-effecting projections.
Expand All @@ -134,7 +133,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Insert with RETURNING statement with side-effects should not auto-commit.
Expand All @@ -159,7 +157,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Another way to test the scenario above: generate an error and ensure that the
Expand Down Expand Up @@ -195,7 +192,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 Put, 1 EndTxn to (n1,s1):1

# Multi-row upsert should auto-commit.
Expand All @@ -217,7 +213,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 Put, 1 EndTxn to (n1,s1):1

# No auto-commit inside a transaction.
Expand Down Expand Up @@ -266,7 +261,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 2 Put, 1 EndTxn to (n1,s1):1

# TODO(radu): allow non-side-effecting projections.
Expand All @@ -290,7 +284,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Upsert with RETURNING statement with side-effects should not auto-commit.
Expand All @@ -315,7 +308,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Another way to test the scenario above: generate an error and ensure that the
Expand Down Expand Up @@ -351,7 +343,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put, 1 EndTxn to (n1,s1):1

Expand Down Expand Up @@ -403,8 +394,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put, 1 EndTxn to (n1,s1):1

# TODO(radu): allow non-side-effecting projections.
Expand All @@ -429,8 +418,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Update with RETURNING statement with side-effects should not auto-commit.
Expand All @@ -456,8 +443,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Another way to test the scenario above: generate an error and ensure that the
Expand Down Expand Up @@ -493,8 +478,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 DelRng, 1 EndTxn to (n1,s1):1

# Multi-row delete should auto-commit.
Expand All @@ -516,8 +499,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 DelRng, 1 EndTxn to (n1,s1):1

# No auto-commit inside a transaction.
Expand Down Expand Up @@ -566,7 +547,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Del, 1 EndTxn to (n1,s1):1

Expand All @@ -590,7 +570,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Del to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
Expand All @@ -616,7 +595,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Del to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
Expand Down Expand Up @@ -666,7 +644,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 Scan to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
Expand All @@ -690,7 +667,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 1 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
Expand All @@ -716,7 +692,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 1 Del to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
Expand Down Expand Up @@ -745,7 +720,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 1 Del, 1 EndTxn to (n1,s1):1

Expand Down Expand Up @@ -775,7 +749,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
Expand All @@ -801,7 +774,6 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
2 changes: 1 addition & 1 deletion pkg/util/tracing/tracer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var tracingMode = settings.RegisterEnumSetting(
"trace.mode",
"if set to 'background', traces will be created for all operations (in"+
"'legacy' mode it's created when explicitly requested or when auxiliary tracers are configured)",
"background",
"legacy",
map[int64]string{
int64(modeLegacy): "legacy",
int64(modeBackground): "background",
Expand Down

0 comments on commit cc12bbc

Please sign in to comment.