Skip to content

Commit 9dfba58

Browse files
committed
[#28772] docdb: Disable table-level locks for geo-partitioning tests failing due to #28317
Summary: A handful of geo-partitioning tests explicitly test when transactions are not started as region-local. This fails when table-level locks are enabled due to #28317. Disabling table-level locks for those tests until #28317 is fixed: - GeoTransactionsTest.TestTransactionTabletSelection - GeoTransactionsTest.TestTransactionTabletSelectionWildcard - GeoTransactionsTest.TestAutomaticLocalTransactionTableCreation - GeoTransactionsTablespaceLocalityTest.TestSimple - GeoTransactionsTablespaceLocalityTest.TestFK - GeoTransactionsTablespaceLocalityTest.TestAlterSetTablespace Jira: DB-18485, DB-17999 Test Plan: Tested above tests with changes over D44416. Reviewers: bkolagani, rthallam Reviewed By: rthallam Subscribers: ybase, yql Differential Revision: https://phorge.dev.yugabyte.com/D47137
1 parent 36302f2 commit 9dfba58

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

src/yb/yql/pgwrapper/geo_transactions-test.cc

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,10 @@ class GeoTransactionsTestTableLocksDisabled : public GeoTransactionsTest {
288288
}
289289
};
290290

291-
TEST_F(GeoTransactionsTest, YB_DISABLE_TEST_IN_TSAN(TestTransactionTabletSelection)) {
291+
// Fails when table-level locks are enabled due to #28317.
292+
TEST_F_EX(
293+
GeoTransactionsTest, YB_DISABLE_TEST_IN_TSAN(TestTransactionTabletSelection),
294+
GeoTransactionsTestTableLocksDisabled) {
292295
constexpr int tables_per_region = 1;
293296

294297
ANNOTATE_UNPROTECTED_WRITE(FLAGS_auto_create_local_transaction_tables) = false;
@@ -466,7 +469,10 @@ TEST_F(GeoTransactionsTest, YB_DISABLE_TEST_IN_TSAN(TestMultiRegionTransactionTa
466469
InsertToLocalFirst::kTrue, ExpectedLocality::kGlobal);
467470
}
468471

469-
TEST_F(GeoTransactionsTest, YB_DISABLE_TEST_IN_TSAN(TestAutomaticLocalTransactionTableCreation)) {
472+
// Fails when table-level locks are enabled due to #28317.
473+
TEST_F_EX(
474+
GeoTransactionsTest, YB_DISABLE_TEST_IN_TSAN(TestAutomaticLocalTransactionTableCreation),
475+
GeoTransactionsTestTableLocksDisabled) {
470476
constexpr int tables_per_region = 1;
471477

472478
ANNOTATE_UNPROTECTED_WRITE(FLAGS_auto_create_local_transaction_tables) = true;
@@ -933,6 +939,9 @@ class GeoTransactionsTablespaceLocalityTest : public GeoTransactionsTest {
933939
constexpr static auto kTableNameFK = "table_multi_region_fk";
934940

935941
void SetUp() override {
942+
// These tests are failing when table-level locks are enabled due to #28317.
943+
ANNOTATE_UNPROTECTED_WRITE(FLAGS_enable_object_locking_for_table_locks) = false;
944+
ANNOTATE_UNPROTECTED_WRITE(FLAGS_ysql_yb_ddl_transaction_block_enabled) = false;
936945
GeoTransactionsTest::SetUp();
937946
ANNOTATE_UNPROTECTED_WRITE(FLAGS_auto_create_local_transaction_tables) = true;
938947
ANNOTATE_UNPROTECTED_WRITE(FLAGS_use_tablespace_based_transaction_placement) = true;
@@ -1233,7 +1242,8 @@ TEST_F(GeoTransactionsTablespaceLocalityTest, TestAlterSetTablespace) {
12331242
ExpectedLocality::kGlobal);
12341243
}
12351244

1236-
class GeoTransactionsWildcardTest : public GeoTransactionsTest {
1245+
// Fails when table-level locks are enabled due to #28317.
1246+
class GeoTransactionsWildcardTest : public GeoTransactionsTestTableLocksDisabled {
12371247
protected:
12381248
void SetupTablespaces() override {
12391249
ANNOTATE_UNPROTECTED_WRITE(FLAGS_force_global_transactions) = true;

0 commit comments

Comments
 (0)