Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

logictest: disable autocommit_before_ddl under 3node-tenant #140187

Merged
merged 1 commit into from
Jan 31, 2025
Merged

logictest: disable autocommit_before_ddl under 3node-tenant #140187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/sql/logictest/logic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,6 +1684,16 @@ func (t *logicTest) newCluster(
tenantID := serverutils.TestTenantID()
conn := t.cluster.SystemLayer(0).SQLConn(t.rootT)

// TODO(rafi): Remove this setting. We're adding it since the 3node-tenant
// config seem to be flaky with autcommit_before_ddl = true. Disable that
// setting for multitenant configs while the issue is being investigated.
if _, err := conn.Exec(
"ALTER TENANT [$1] SET CLUSTER SETTING sql.defaults.autocommit_before_ddl.enabled = false",
tenantID.ToUint64(),
); err != nil {
t.Fatal(err)
}

clusterSettings := toa.clusterSettings
if len(clusterSettings) > 0 {
// We reduce the closed timestamp duration on the host tenant so that the
Expand Down
8 changes: 5 additions & 3 deletions pkg/sql/logictest/testdata/logic_test/drop_index
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,13 +339,15 @@ fk1 CREATE TABLE public.fk1 (
# test that notices are generated on index drops
subtest notice_on_drop_index

statement ok
CREATE TABLE drop_index_test(a int);
CREATE INDEX drop_index_test_index ON drop_index_test(a);

# Weak isolation levels emit extra notices, so skip them.
skipif config weak-iso-level-configs
query T noticetrace
CREATE TABLE drop_index_test(a int); CREATE INDEX drop_index_test_index ON drop_index_test(a); DROP INDEX drop_index_test_index
DROP INDEX drop_index_test_index
----
NOTICE: auto-committing transaction before processing DDL due to autocommit_before_ddl setting
NOTICE: auto-committing transaction before processing DDL due to autocommit_before_ddl setting
NOTICE: the data for dropped indexes is reclaimed asynchronously
HINT: The reclamation delay can be customized in the zone configuration for the table.

Expand Down
6 changes: 3 additions & 3 deletions pkg/sql/logictest/testdata/logic_test/txn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ ROLLBACK TRANSACTION
# COMMIT/ROLLBACK without a transaction are allowed when autocommit_before_ddl=true.

statement ok
RESET autocommit_before_ddl
SET autocommit_before_ddl = true

statement ok
COMMIT TRANSACTION
Expand All @@ -207,7 +207,7 @@ SET TRANSACTION ISOLATION LEVEL REPEATABLE READ
# Set isolation level without a transaction is a warning when autocommit_before_ddl=true.

statement ok
RESET autocommit_before_ddl
SET autocommit_before_ddl = true

query T noticetrace
SET TRANSACTION ISOLATION LEVEL REPEATABLE READ
Expand Down Expand Up @@ -544,7 +544,7 @@ statement error pgcode 25P01 there is no transaction in progress
SET TRANSACTION PRIORITY LOW

statement ok
RESET autocommit_before_ddl
SET autocommit_before_ddl = true

query T noticetrace
SET TRANSACTION PRIORITY LOW
Expand Down
Loading