Merge #147852 #147988

147852: roachtest: enable create_table_with_schema_locked for ORM tests r=fqazi a=fqazi

Previously, schema_locked had to be manually set after creating objects,
to make sure objects were schema_locked. We recently added the ability
to create tables by default with schema_locked, which we will enable by
default in our ORM tests.


Informs: #129694
Release note: None

147988: workload/schemachanger: temporarily skip DROP TRIGGER in RSW r=spilchen a=spilchen

In the random schemachanger workload, you can hit an infinite recursion case when doing a cascading drop with the legacy schema changer. This root cause of this is that DROP TRIGGER can end up orphaning a backref. The fix for the root cause will be addressed in #147981. Until that is fixed, this change will skip DROP TRIGGER so we avoid the infinite recursion.

Fixes #147514

Epic: none
Release note: none

Co-authored-by: Faizan Qazi <[email protected]>
Co-authored-by: Matt Spilchen <[email protected]>

Author: 3 people

pkg/cmd/roachtest/tests/django_blocklist.go

@@ -158,6 +158,9 @@ var enabledDjangoTests = []string{
 
 // Maintain that this list is alphabetized.
 var djangoBlocklist = blocklist{
+	// Schema change used by this test:
+	// ALTER TABLE schema_author ALTER COLUMN name SET DATA TYPE STRING, ALTER COLUMN name DROP NOT NULL
+	`schema.tests.SchemaTests.test_alter`:                              "ALTER COLUMN ... DROP NOT NULL is not supported in declarative schema changer (prevents from working with schema_locked)",
 	`schema.tests.SchemaTests.test_alter_text_field_to_date_field`:     "alter type requires USING",
 	`schema.tests.SchemaTests.test_alter_text_field_to_datetime_field`: "alter type requires USING",
 	`schema.tests.SchemaTests.test_alter_text_field_to_time_field`:     "alter type requires USING",

pkg/cmd/roachtest/tests/orm_helpers.go

@@ -77,6 +77,7 @@ func alterZoneConfigAndClusterSettings(
 		`ALTER ROLE ALL SET statement_timeout = '60s'`,
 		`ALTER ROLE ALL SET default_transaction_isolation = 'read committed'`,
 		`ALTER ROLE ALL SET autocommit_before_ddl = 'true'`,
+		`ALTER ROLE ALL SET create_table_with_schema_locked='true'`,
 	} {
 		if _, err := db.ExecContext(ctx, cmd); err != nil {
 			return err

pkg/workload/schemachange/optype.go

@@ -315,7 +315,7 @@ var opWeights = []int{
 	dropSchema:                        1,
 	dropSequence:                      1,
 	dropTable:                         1,
-	dropTrigger:                       1,
+	dropTrigger:                       0, // TODO(147981): re-enable once we fix orphaning of backref in DROP TRIGGER
 	dropView:                          1,
 	renameIndex:                       1,
 	renameSequence:                    1,