[yugabyte#29317] DocDB: Upgrade object locking flag to a regular non runtime flag

basavaraj29 · basavaraj29 · commit 635a95e21c1b · 2025-11-11T17:05:28.000Z
Summary: Promote the object locking preview flag to a regular flag. The feature would be controlled by a combination of the autoflag `enable_object_locking_infra` and the non runtime flag `enable_object_locking_for_table_locks`. Note: The autoflag `enable_object_locking_infra` will be enabled in 2025.2 by default (and cannot be modified by user), but `enable_object_locking_for_table_locks` flag can be toggled to control the feature as desired. Test Plan: Jenkins Reviewers: rthallam, amitanand, stiwary Reviewed By: rthallam Subscribers: stiwary, yql, ybase Differential Revision: https://phorge.dev.yugabyte.com/D48184
diff --git a/docs/content/stable/explore/transactions/explicit-locking.md b/docs/content/stable/explore/transactions/explicit-locking.md
@@ -136,8 +136,6 @@ To prevent dead TServers holding locks from permanently blocking subsequent DMLs
 
 Table-level locks are disabled by default. To enable the feature, set the [yb-tserver](../../../reference/configuration/yb-tserver/) flag `enable_object_locking_for_table_locks` to true.
 
-Because `enable_object_locking_for_table_locks` is a preview flag, to use it, add the flag to the [allowed_preview_flags_csv](../../../reference/configuration/yb-tserver/#allowed-preview-flags-csv) list (that is, `allowed_preview_flags_csv=enable_object_locking_for_table_locks`).
-
 As the table-level locks feature depends on Transactional DDL (currently not enabled by default), you need to enable the preview flag, [ysql_yb_ddl_transaction_block_enabled](../transactional-ddl/#enable-transactional-ddl).
 
 For more information on the lock scopes and lifecycle, see [Table-level locks](../../../architecture/transactions/concurrency-control/#table-level-locks).
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestAlterTableWithConcurrentTxn.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestAlterTableWithConcurrentTxn.java
@@ -40,7 +40,6 @@ protected Map<String, String> getTServerFlags() {
     // The test suite asserts for DML failing when run in concurrent to ALTER,
     // and doesn't expect proper wait-on behavior for DML-DDL interaction.
     Map<String, String> flagMap = super.getTServerFlags();
-    flagMap.put("allowed_preview_flags_csv", "enable_object_locking_for_table_locks");
     flagMap.put("enable_object_locking_for_table_locks", "false");
     return flagMap;
   }
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestDdlSavepoints.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestDdlSavepoints.java
@@ -34,16 +34,11 @@ protected void customizeMiniClusterBuilder(MiniYBClusterBuilder builder) {
     builder.enablePgTransactions(true);
     builder.addCommonTServerFlag("ysql_log_statement", "all");
     builder.addCommonTServerFlag("ysql_yb_ddl_transaction_block_enabled", "true");
-    builder.addCommonTServerFlag("allowed_preview_flags_csv",
-        "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     builder.addCommonTServerFlag("enable_object_locking_for_table_locks", "true");
     builder.addCommonTServerFlag("TEST_ysql_yb_enable_ddl_savepoint_support", "true");
     builder.addMasterFlag("ysql_yb_ddl_transaction_block_enabled", "true");
-    builder.addMasterFlag("enable_object_locking_for_table_locks", "true");
     builder.addMasterFlag("TEST_ysql_yb_enable_ddl_savepoint_support", "true");
     builder.addMasterFlag("vmodule", "catalog_manager=3,ysql_ddl_handler=4");
-    builder.addMasterFlag("allowed_preview_flags_csv",
-        "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
   }
 
   @Test
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestDdlTransactionBlocks.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestDdlTransactionBlocks.java
@@ -34,8 +34,6 @@ protected void customizeMiniClusterBuilder(MiniYBClusterBuilder builder) {
     builder.enablePgTransactions(true);
     builder.addCommonTServerFlag("ysql_log_statement", "all");
     builder.addCommonTServerFlag("ysql_yb_ddl_transaction_block_enabled", "true");
-    builder.addCommonTServerFlag("allowed_preview_flags_csv",
-        "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     builder.addCommonTServerFlag("enable_object_locking_for_table_locks", "true");
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestDropTableWithConcurrentTxn.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestDropTableWithConcurrentTxn.java
@@ -52,8 +52,6 @@ protected Map<String, String> getTServerFlags() {
     // TODO(29141): Fix the test with txn ddl and enable.
     flagMap.put("ysql_yb_ddl_transaction_block_enabled", "false");
     flagMap.put("enable_object_locking_for_table_locks", "false");
-    flagMap.put("allowed_preview_flags_csv",
-        "ysql_yb_ddl_transaction_block_enabled,enable_object_locking_for_table_locks");
     return flagMap;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgCacheConsistency.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgCacheConsistency.java
@@ -49,8 +49,6 @@ protected Map<String, String> getTServerFlags() {
     appendToYsqlPgConf(flags, "log_statement=all");
     // The test suite asserts for DML failing with catalog version mismatch when run
     // immediately after DDLs, which isn't true with object locking enabled.
-    flags.put("allowed_preview_flags_csv",
-        "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     flags.put("enable_object_locking_for_table_locks", "false");
     // TODO(29142): Fix the test with txn ddl and reenable.
     flags.put("ysql_yb_ddl_transaction_block_enabled", "false");
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgDdlConcurrency.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgDdlConcurrency.java
@@ -45,8 +45,6 @@ protected Map<String, String> getTServerFlags() {
     // TODO(#28745): Revisit this. Runs into a deadlock issue with table locks/txn-ddl enabled.
     flags.put("enable_object_locking_for_table_locks", "false");
     flags.put("ysql_yb_ddl_transaction_block_enabled", "false");
-    flags.put("allowed_preview_flags_csv",
-              "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     return flags;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgDdlFaultTolerance.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgDdlFaultTolerance.java
@@ -42,8 +42,6 @@ protected Map<String, String> getTServerFlags() {
     // The test looks for a specific error message. So let's just disble the table locks here.
     flags.put("enable_object_locking_for_table_locks", "false");
     flags.put("ysql_yb_ddl_transaction_block_enabled", "false");
-    flags.put("allowed_preview_flags_csv",
-              "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     return flags;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgParallelReadIsolation.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgParallelReadIsolation.java
@@ -32,8 +32,6 @@ public class TestPgParallelReadIsolation extends BasePgSQLTest {
   protected Map<String, String> getTServerFlags() {
     Map<String, String> flagMap = super.getTServerFlags();
     flagMap.put("yb_enable_read_committed_isolation", "true");
-    flagMap.put("allowed_preview_flags_csv",
-                "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     flagMap.put("enable_object_locking_for_table_locks", "true");
     flagMap.put("ysql_yb_ddl_transaction_block_enabled", "true");
     return flagMap;
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgPushdownEfficiency.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgPushdownEfficiency.java
@@ -22,8 +22,6 @@ protected Map<String, String> getTServerFlags() {
     // table locks.
     flagMap.put("ysql_yb_ddl_transaction_block_enabled", "true");
     flagMap.put("enable_object_locking_for_table_locks", "false");
-    flagMap.put("allowed_preview_flags_csv",
-        "ysql_yb_ddl_transaction_block_enabled,enable_object_locking_for_table_locks");
     return flagMap;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressIndex.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressIndex.java
@@ -41,8 +41,6 @@ protected Map<String, String> getTServerFlags() {
     // TODO(29143): Fix the test with txn ddl and reenable.
     flagMap.put("ysql_yb_ddl_transaction_block_enabled", "false");
     flagMap.put("enable_object_locking_for_table_locks", "false");
-    flagMap.put("allowed_preview_flags_csv",
-        "ysql_yb_ddl_transaction_block_enabled,enable_object_locking_for_table_locks");
     return flagMap;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressIsolationWithTxnDdl.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressIsolationWithTxnDdl.java
@@ -32,8 +32,6 @@ protected Map<String, String> getTServerFlags() {
     // consider updating the expected output accordingly, to expect a
     // deadlock detection error. For now, disable table locks here.
     flagMap.put("enable_object_locking_for_table_locks", "false");
-    flagMap.put("allowed_preview_flags_csv",
-        "ysql_yb_ddl_transaction_block_enabled,enable_object_locking_for_table_locks");
     return flagMap;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressLock.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressLock.java
@@ -36,8 +36,6 @@ public int getTestMethodTimeoutSec() {
   @Override
   protected Map<String, String> getTServerFlags() {
     Map<String, String> flagMap = super.getTServerFlags();
-    flagMap.put("allowed_preview_flags_csv",
-                "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     flagMap.put("enable_object_locking_for_table_locks", "true");
     // TODO(#27819): Revert to default waiter timeout once the GH is addressed.
     flagMap.put("refresh_waiter_timeout_ms", "5000");
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressMatview.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressMatview.java
@@ -34,8 +34,6 @@ protected Map<String, String> getTServerFlags() {
     // TODO(#26734): Enable transactional DDL (& table locks) once savepoint for DDLs are supported.
     flags.put("ysql_yb_ddl_transaction_block_enabled", "false");
     flags.put("enable_object_locking_for_table_locks", "false");
-    flags.put("allowed_preview_flags_csv",
-              "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     return flags;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressParallel.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressParallel.java
@@ -35,8 +35,6 @@ protected Map<String, String> getTServerFlags() {
     // TODO(#26734): Enable transactional DDL (& table locks) once savepoint for DDLs are supported.
     flags.put("ysql_yb_ddl_transaction_block_enabled", "false");
     flags.put("enable_object_locking_for_table_locks", "false");
-    flags.put("allowed_preview_flags_csv",
-              "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     // (Auto-Analyze #28057) Query plans change after enabling auto analyze.
     flags.put("ysql_enable_auto_analyze", "false");
     return flags;
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressPgAuth.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressPgAuth.java
@@ -31,8 +31,6 @@ public int getTestMethodTimeoutSec() {
   @Override
   protected Map<String, String> getTServerFlags() {
     Map<String, String> flagMap = super.getTServerFlags();
-    flagMap.put("allowed_preview_flags_csv",
-                "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     flagMap.put("enable_object_locking_for_table_locks", "true");
     flagMap.put("ysql_yb_ddl_transaction_block_enabled", "true");
     flagMap.put("ysql_enable_reindex", "true");
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressPgMiscIndependent.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressPgMiscIndependent.java
@@ -38,8 +38,6 @@ protected Map<String, String> getTServerFlags() {
     // TODO(#26734): Enable transactional DDL (& table locks) once savepoint for DDLs are supported.
     flagMap.put("ysql_yb_ddl_transaction_block_enabled", "false");
     flagMap.put("enable_object_locking_for_table_locks", "false");
-    flagMap.put("allowed_preview_flags_csv",
-              "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     return flagMap;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressPgTransactions.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressPgTransactions.java
@@ -40,8 +40,6 @@ protected Map<String, String> getTServerFlags() {
     // TODO(#26734): Enable transactional DDL (& table locks) once savepoint for DDLs are supported.
     flags.put("ysql_yb_ddl_transaction_block_enabled", "false");
     flags.put("enable_object_locking_for_table_locks", "false");
-    flags.put("allowed_preview_flags_csv",
-              "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     return flags;
   }
 
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressProc.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressProc.java
@@ -39,7 +39,6 @@ protected Map<String, String> getTServerFlags() {
     // as the object locks on catalog tables don't seem very deterministic amidst DDLs. Hence
     // disabling object locking for this tests (there are other tests where pg_locks is tested for
     // with object locking enabled).
-    flagMap.put("allowed_preview_flags_csv", "enable_object_locking_for_table_locks");
     flagMap.put("enable_object_locking_for_table_locks", "false");
     return flagMap;
   }
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressThirdPartyExtensionsPostgresqlAnonymizer.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgRegressThirdPartyExtensionsPostgresqlAnonymizer.java
@@ -47,8 +47,6 @@ protected Map<String, String> getTServerFlags() {
     // TODO(#26734): Enable transactional DDL once savepoint for DDLs are supported.
     flagMap.put("ysql_yb_ddl_transaction_block_enabled", "false");
     flagMap.put("enable_object_locking_for_table_locks","false");
-    flagMap.put("allowed_preview_flags_csv",
-      "ysql_yb_ddl_transaction_block_enabled,enable_object_locking_for_table_locks");
 
     // (Auto Analyze #28391) Restarting a DDL transaction not supported
     flagMap.put("ysql_enable_auto_analyze", "false");
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgTransparentRestarts.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestPgTransparentRestarts.java
@@ -128,8 +128,6 @@ protected Map<String, String> getTServerFlags() {
     flags.put("ysql_output_buffer_size", String.valueOf(PG_OUTPUT_BUFFER_SIZE_BYTES));
     flags.put("yb_enable_read_committed_isolation", "true");
     flags.put("wait_queue_poll_interval_ms", "5");
-    flags.put("allowed_preview_flags_csv",
-              "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");
     flags.put("enable_object_locking_for_table_locks", "true");
     flags.put("ysql_yb_ddl_transaction_block_enabled", "true");
     return flags;
diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestSchemaVersionMismatch.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestSchemaVersionMismatch.java
@@ -62,7 +62,6 @@ protected Map<String, String> getTServerFlags() {
     // The test expects schema version mismatch errors admist processing of DDLs, most of which
     // are eliminated with object locking. Hence, disable the feature for the test.
     flagMap.put("enable_object_locking_for_table_locks", "false");
-    flagMap.put("allowed_preview_flags_csv", "enable_object_locking_for_table_locks");
     return flagMap;
   }
 
diff --git a/src/yb/common/common_flags.cc b/src/yb/common/common_flags.cc
@@ -214,7 +214,7 @@ DEFINE_RUNTIME_uint64(refresh_waiter_timeout_ms, 30000,
 TAG_FLAG(refresh_waiter_timeout_ms, advanced);
 TAG_FLAG(refresh_waiter_timeout_ms, hidden);
 
-DEFINE_NON_RUNTIME_PREVIEW_bool(enable_object_locking_for_table_locks, false,
+DEFINE_NON_RUNTIME_bool(enable_object_locking_for_table_locks, false,
     "This flag enables the object lock APIs provided by tservers and masters - "
     "AcquireObject(Global)Lock, ReleaseObject(Global)Lock. These APIs are used to "
     "implement pg table locks.");
diff --git a/src/yb/integration-tests/create-table-itest.cc b/src/yb/integration-tests/create-table-itest.cc
@@ -606,7 +606,6 @@ TEST_F(CreateTableITest, TestTransactionStatusTableCreation) {
       // TODO(#27854): We get stuck with object locking when there is no system.transactions
       // table. Disabling it for now until we fix the underlying issue.
       "--enable_object_locking_for_table_locks=false",
-      "--allowed_preview_flags_csv=enable_object_locking_for_table_locks",
   };
   // We also need to enable ysql.
   ASSERT_NO_FATALS(StartCluster(tserver_flags, master_flags, 1, 1, true));
diff --git a/src/yb/integration-tests/master_heartbeat-itest.cc b/src/yb/integration-tests/master_heartbeat-itest.cc
@@ -766,7 +766,6 @@ void GlobalTransactionTableCreationTest::SetUp() {
       // TODO(#27854): We get stuck with object locking when there is no system.transactions
       // table. Disabling it for now until we fix the underlying issue.
       "--enable_object_locking_for_table_locks=false",
-      "--allowed_preview_flags_csv=enable_object_locking_for_table_locks",
   };
   cluster_ = std::make_unique<ExternalMiniCluster>(opts);
   ASSERT_OK(cluster_->Start());
diff --git a/src/yb/integration-tests/object_lock-test.cc b/src/yb/integration-tests/object_lock-test.cc
@@ -1691,8 +1691,6 @@ ExternalMiniClusterOptions ExternalObjectLockTest::MakeExternalMiniClusterOption
       "--enable_load_balancing=false",
       "--TEST_olm_skip_sending_wait_for_probes=false"};
   opts.extra_tserver_flags = {
-      Format("--allowed_preview_flags_csv=$0,$1",
-             "enable_object_locking_for_table_locks", "ysql_yb_ddl_transaction_block_enabled"),
       "--enable_object_locking_for_table_locks",
       "--ysql_yb_ddl_transaction_block_enabled",
       Format("--ysql_lease_refresher_interval_ms=$0", kDefaultYSQLLeaseRefreshIntervalMilli),
@@ -1745,8 +1743,6 @@ ExternalObjectLockTestOneTSWithoutLease::MakeExternalMiniClusterOptions() {
       Format("--object_lock_cleanup_interval_ms=$0", kDefaultMasterObjectLockCleanupIntervalMilli),
       "--enable_load_balancing=false"};
   opts.extra_tserver_flags = {
-      Format("--allowed_preview_flags_csv=$0,$1",
-             "enable_object_locking_for_table_locks", "ysql_yb_ddl_transaction_block_enabled"),
       "--enable_object_locking_for_table_locks",
       "--ysql_yb_ddl_transaction_block_enabled",
       Format("--ysql_lease_refresher_interval_ms=$0", kDefaultYSQLLeaseRefreshIntervalMilli),
@@ -1763,8 +1759,6 @@ ExternalMiniClusterOptions ExternalObjectLockTestLongLeaseTTL::MakeExternalMiniC
       Format("--master_ysql_operation_lease_ttl_ms=$0", 20 * 1000),
       "--enable_load_balancing=false"};
   opts.extra_tserver_flags = {
-      Format("--allowed_preview_flags_csv=$0,$1",
-             "enable_object_locking_for_table_locks", "ysql_yb_ddl_transaction_block_enabled"),
       "--enable_object_locking_for_table_locks",
       "--ysql_yb_ddl_transaction_block_enabled",
       Format("--ysql_lease_refresher_interval_ms=$0", kDefaultYSQLLeaseRefreshIntervalMilli)};
diff --git a/src/yb/integration-tests/pg_partman-test.cc b/src/yb/integration-tests/pg_partman-test.cc
@@ -36,9 +36,6 @@ class PgPartmanTest : public MiniClusterTestWithClient<ExternalMiniCluster> {
     // TODO(#28726): Reenable once pg_partman supports transactional ddl.
     opts.extra_tserver_flags.push_back("--ysql_yb_ddl_transaction_block_enabled=false");
     opts.extra_tserver_flags.push_back("--enable_object_locking_for_table_locks=false");
-    opts.extra_tserver_flags.push_back(
-        Format("--allowed_preview_flags_csv=$0,$1",
-                "enable_object_locking_for_table_locks", "ysql_yb_ddl_transaction_block_enabled"));
 
     cluster_.reset(new ExternalMiniCluster(opts));
     ASSERT_OK(cluster_->Start());
diff --git a/src/yb/integration-tests/upgrade-tests/ysql_ddl_whitelist-test.cc b/src/yb/integration-tests/upgrade-tests/ysql_ddl_whitelist-test.cc
@@ -35,8 +35,6 @@ class YsqlDdlWhitelistTest : public pgwrapper::PgMiniTestBase {
   void SetUp() override {
     // TODO(#28742): Fix interaction of ysql_yb_ddl_transaction_block_enabled with
     // yb_force_catalog_update_on_next_ddl. For now, disable table locks for this test.
-    ANNOTATE_UNPROTECTED_WRITE(FLAGS_allowed_preview_flags_csv) =
-        "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled";
     ANNOTATE_UNPROTECTED_WRITE(FLAGS_enable_object_locking_for_table_locks) = false;
     ANNOTATE_UNPROTECTED_WRITE(FLAGS_ysql_yb_ddl_transaction_block_enabled) = false;
     pgwrapper::PgMiniTestBase::SetUp();
diff --git a/src/yb/integration-tests/upgrade-tests/ysql_major_upgrade_test_base.cc b/src/yb/integration-tests/upgrade-tests/ysql_major_upgrade_test_base.cc
@@ -50,10 +50,6 @@ void YsqlMajorUpgradeTestBase::SetUpOptions(ExternalMiniClusterOptions& opts) {
       opts.extra_master_flags, "enable_object_locking_for_table_locks", "false");
   AddUnDefOkAndSetFlag(
       opts.extra_tserver_flags, "enable_object_locking_for_table_locks", "false");
-  AppendFlagToAllowedPreviewFlagsCsv(
-      opts.extra_master_flags, "enable_object_locking_for_table_locks");
-  AppendFlagToAllowedPreviewFlagsCsv(
-      opts.extra_tserver_flags, "enable_object_locking_for_table_locks");
 }
 
 Status YsqlMajorUpgradeTestBase::ValidateUpgradeCompatibility(const std::string& user_name) {
diff --git a/src/yb/tools/yb-admin-test.cc b/src/yb/tools/yb-admin-test.cc
@@ -574,9 +574,6 @@ class AdminCliTestForTableLocks : public AdminCliTest {
  public:
   void UpdateMiniClusterOptions(ExternalMiniClusterOptions* options) override {
     options->enable_ysql = true;
-    options->extra_tserver_flags.push_back(
-        Format("--allowed_preview_flags_csv=$0,$1",
-               "enable_object_locking_for_table_locks", "ysql_yb_ddl_transaction_block_enabled"));
     options->extra_tserver_flags.push_back("--enable_object_locking_for_table_locks=true");
     options->extra_tserver_flags.push_back("--ysql_yb_ddl_transaction_block_enabled=true");
   }
diff --git a/src/yb/tools/yb-backup/yb-backup-cross-feature-test.cc b/src/yb/tools/yb-backup/yb-backup-cross-feature-test.cc
@@ -2699,8 +2699,6 @@ class YBDdlAtomicityBackupTest : public YBBackupTestBase, public pgwrapper::PgDd
     // Disable table locks to avoid issues during SuccessfulDdlAtomicityTest
     // Test enables TEST_pause_ddl_rollback which may block table locks for ddl from
     // being released. Hence blocking the following statements from failing to acquire locks.
-    AppendFlagToAllowedPreviewFlagsCsv(
-        options->extra_tserver_flags, "enable_object_locking_for_table_locks");
     options->extra_tserver_flags.push_back("--enable_object_locking_for_table_locks=false");
     pgwrapper::PgDdlAtomicityTestBase::UpdateMiniClusterOptions(options);
   }
diff --git a/src/yb/tools/yb-backup/yb-backup-test_base.cc b/src/yb/tools/yb-backup/yb-backup-test_base.cc
@@ -135,12 +135,6 @@ void YBBackupTest::SetUp() {
 void YBBackupTest::UpdateMiniClusterOptions(ExternalMiniClusterOptions* options) {
   pgwrapper::PgCommandTestBase::UpdateMiniClusterOptions(options);
   options->extra_master_flags.push_back("--ysql_legacy_colocated_database_creation=false");
-  options->extra_master_flags.push_back(
-      "--allowed_preview_flags_csv=enable_object_locking_for_table_locks,"
-                                  "ysql_yb_ddl_transaction_block_enabled");
-  options->extra_tserver_flags.push_back(
-      "--allowed_preview_flags_csv=enable_object_locking_for_table_locks,"
-                                  "ysql_yb_ddl_transaction_block_enabled");
 }
 
 Status YBBackupTest::RunBackupCommand(const vector<string>& args) {
diff --git a/src/yb/yql/pggate/pg_txn_manager.cc b/src/yb/yql/pggate/pg_txn_manager.cc
@@ -232,15 +232,19 @@ void PgTxnManager::DEBUG_UpdateLastObjectLockingInfo() {
 
 void PgTxnManager::DEBUG_CheckOptionsForPerform(
     const tserver::PgPerformOptionsPB& options) const {
-  if (!enable_table_locking_ || options.ddl_mode() || options.use_catalog_session()) {
+  // Functions like YBCheckSharedCatalogCacheVersion, being executed outside scope of a
+  // transaction block seem to issue custom selects on pg_yb_catalog_version table using
+  // YBCPgNewSelect, skipping object locks. Skip the assertion for such cases for now.
+  if (!enable_table_locking_ || options.ddl_mode() || options.use_catalog_session() ||
+      options.yb_non_ddl_txn_for_sys_tables_allowed() || YBCIsInitDbModeEnvVarSet()) {
     return;
   }
 
   const DEBUG_TxnInfo active_txn_info{*this};
 
   if (!debug_last_object_locking_txn_info_ ||
       *debug_last_object_locking_txn_info_ != active_txn_info) {
-    LOG(FATAL)
+    LOG(DFATAL)
         << "active txn info: " << AsString(active_txn_info)
         << " , last object locking txn info: " << AsString(debug_last_object_locking_txn_info_);
   }
diff --git a/src/yb/yql/pgwrapper/alter_table_with_concurrent_txn-test.cc b/src/yb/yql/pgwrapper/alter_table_with_concurrent_txn-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_alter_add_column_default-test.cc b/src/yb/yql/pgwrapper/pg_alter_add_column_default-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_ash-test.cc b/src/yb/yql/pgwrapper/pg_ash-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_auto_analyze-test.cc b/src/yb/yql/pgwrapper/pg_auto_analyze-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_backends-test.cc b/src/yb/yql/pgwrapper/pg_backends-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_cache_refresh-test.cc b/src/yb/yql/pgwrapper/pg_cache_refresh-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_catalog_version-test.cc b/src/yb/yql/pgwrapper/pg_catalog_version-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_ddl_atomicity-test.cc b/src/yb/yql/pgwrapper/pg_ddl_atomicity-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_ddl_atomicity_stress-test.cc b/src/yb/yql/pgwrapper/pg_ddl_atomicity_stress-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_drop_column_test.cc b/src/yb/yql/pgwrapper/pg_drop_column_test.cc
diff --git a/src/yb/yql/pgwrapper/pg_hint_table-test.cc b/src/yb/yql/pgwrapper/pg_hint_table-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_index_backfill-test.cc b/src/yb/yql/pgwrapper/pg_index_backfill-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_libpq-test.cc b/src/yb/yql/pgwrapper/pg_libpq-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_object_locks-test.cc b/src/yb/yql/pgwrapper/pg_object_locks-test.cc
diff --git a/src/yb/yql/pgwrapper/pg_stat_activity-test.cc b/src/yb/yql/pgwrapper/pg_stat_activity-test.cc

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ protected Map<String, String> getTServerFlags() {`
`40`	`40`	`// The test suite asserts for DML failing when run in concurrent to ALTER,`
`41`	`41`	`// and doesn't expect proper wait-on behavior for DML-DDL interaction.`
`42`	`42`	`Map<String, String> flagMap = super.getTServerFlags();`
`43`		`- flagMap.put("allowed_preview_flags_csv", "enable_object_locking_for_table_locks");`
`44`	`43`	`flagMap.put("enable_object_locking_for_table_locks", "false");`
`45`	`44`	`return flagMap;`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ protected void customizeMiniClusterBuilder(MiniYBClusterBuilder builder) {`
`34`	`34`	`builder.enablePgTransactions(true);`
`35`	`35`	`builder.addCommonTServerFlag("ysql_log_statement", "all");`
`36`	`36`	`builder.addCommonTServerFlag("ysql_yb_ddl_transaction_block_enabled", "true");`
`37`		`- builder.addCommonTServerFlag("allowed_preview_flags_csv",`
`38`		`- "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");`
`39`	`37`	`builder.addCommonTServerFlag("enable_object_locking_for_table_locks", "true");`
`40`	`38`	`}`
`41`	`39`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,6 @@ protected Map<String, String> getTServerFlags() {`
`52`	`52`	`// TODO(29141): Fix the test with txn ddl and enable.`
`53`	`53`	`flagMap.put("ysql_yb_ddl_transaction_block_enabled", "false");`
`54`	`54`	`flagMap.put("enable_object_locking_for_table_locks", "false");`
`55`		`- flagMap.put("allowed_preview_flags_csv",`
`56`		`- "ysql_yb_ddl_transaction_block_enabled,enable_object_locking_for_table_locks");`
`57`	`55`	`return flagMap;`
`58`	`56`	`}`
`59`	`57`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ protected Map<String, String> getTServerFlags() {`
`45`	`45`	`// TODO(#28745): Revisit this. Runs into a deadlock issue with table locks/txn-ddl enabled.`
`46`	`46`	`flags.put("enable_object_locking_for_table_locks", "false");`
`47`	`47`	`flags.put("ysql_yb_ddl_transaction_block_enabled", "false");`
`48`		`- flags.put("allowed_preview_flags_csv",`
`49`		`- "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");`
`50`	`48`	`return flags;`
`51`	`49`	`}`
`52`	`50`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ protected Map<String, String> getTServerFlags() {`
`42`	`42`	`// The test looks for a specific error message. So let's just disble the table locks here.`
`43`	`43`	`flags.put("enable_object_locking_for_table_locks", "false");`
`44`	`44`	`flags.put("ysql_yb_ddl_transaction_block_enabled", "false");`
`45`		`- flags.put("allowed_preview_flags_csv",`
`46`		`- "enable_object_locking_for_table_locks,ysql_yb_ddl_transaction_block_enabled");`
`47`	`45`	`return flags;`
`48`	`46`	`}`
`49`	`47`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ protected Map<String, String> getTServerFlags() {`
`22`	`22`	`// table locks.`
`23`	`23`	`flagMap.put("ysql_yb_ddl_transaction_block_enabled", "true");`
`24`	`24`	`flagMap.put("enable_object_locking_for_table_locks", "false");`
`25`		`- flagMap.put("allowed_preview_flags_csv",`
`26`		`- "ysql_yb_ddl_transaction_block_enabled,enable_object_locking_for_table_locks");`
`27`	`25`	`return flagMap;`
`28`	`26`	`}`
`29`	`27`