Skip to content

Commit 3b5bd4f

Browse files
iSignaliSignal
committed
[#26691] YSQL: Fix flaky backup test
Summary: `org.yb.pgsql.TestYbBackup#testPgRegressStyle` fails on MAC builds because it takes longer than 15 mins. On Linux, it runs correctly most of the time but occasionally hits resource limits and triggers long operations on the TServer. Setting the number of tablets per table to 2 (default is 6 on 4 core dev-server) to make the test run faster. Jira: DB-16067 Test Plan: Jenkins Reviewers: loginov, mhaddad Reviewed By: loginov Subscribers: yql Differential Revision: https://phorge.dev.yugabyte.com/D42926
1 parent 10f18ec commit 3b5bd4f

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed

‎java/yb-pgsql/src/test/java/org/yb/pgsql/TestYbBackup.java

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ protected Map<String, String> getMasterFlags() {
112112
protected Map<String, String> getTServerFlags() {
113113
Map<String, String> flagMap = super.getTServerFlags();
114114
flagMap.put("ysql_enable_inheritance", "true");
115+
flagMap.put("ysql_num_tablets", "2");
115116
return flagMap;
116117
}
117118
@Override

‎src/postgres/src/test/regress/expected/yb.orig.backup_restore.out

+29-29
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ CREATE TABLE public.chat_user (
6868
"chatID" text NOT NULL,
6969
CONSTRAINT chat_user_pkey PRIMARY KEY(("chatID") HASH)
7070
)
71-
SPLIT INTO 6 TABLETS;
71+
SPLIT INTO 2 TABLETS;
7272

7373

7474
\if :use_roles
@@ -139,7 +139,7 @@ CREATE TABLE public.hash_tbl_pk_with_multiple_included_columns (
139139
col4 integer,
140140
CONSTRAINT hash_tbl_pk_with_multiple_included_columns_pkey PRIMARY KEY((col1) HASH, col2 ASC) INCLUDE (col3, col4)
141141
)
142-
SPLIT INTO 6 TABLETS;
142+
SPLIT INTO 2 TABLETS;
143143

144144

145145
\if :use_roles
@@ -171,7 +171,7 @@ CREATE TABLE public.level0 (
171171
CONSTRAINT level0_c1_cons CHECK ((c1 > 0)),
172172
CONSTRAINT level0_c1_cons2 CHECK ((c1 IS NULL)) NO INHERIT
173173
)
174-
SPLIT INTO 6 TABLETS;
174+
SPLIT INTO 2 TABLETS;
175175

176176

177177
\if :use_roles
@@ -239,7 +239,7 @@ CREATE TABLE public.level1_1 (
239239
CONSTRAINT level1_1_pkey PRIMARY KEY((c2) HASH)
240240
)
241241
INHERITS (public.level0)
242-
SPLIT INTO 6 TABLETS;
242+
SPLIT INTO 2 TABLETS;
243243

244244

245245
\if :use_roles
@@ -269,7 +269,7 @@ CREATE TABLE public.level2_0 (
269269
c3 text NOT NULL
270270
)
271271
INHERITS (public.level1_0)
272-
SPLIT INTO 6 TABLETS;
272+
SPLIT INTO 2 TABLETS;
273273

274274

275275
\if :use_roles
@@ -306,7 +306,7 @@ CREATE TABLE public.level2_1 (
306306
CONSTRAINT level2_1_pkey PRIMARY KEY((c4) HASH)
307307
)
308308
INHERITS (public.level1_0, public.level1_1)
309-
SPLIT INTO 6 TABLETS;
309+
SPLIT INTO 2 TABLETS;
310310

311311

312312
\if :use_roles
@@ -340,7 +340,7 @@ CREATE TABLE public.p1 (
340340
v text,
341341
CONSTRAINT p1_pkey PRIMARY KEY((k) HASH)
342342
)
343-
SPLIT INTO 6 TABLETS;
343+
SPLIT INTO 2 TABLETS;
344344

345345

346346
\if :use_roles
@@ -374,7 +374,7 @@ CREATE TABLE public.p2 (
374374
v text,
375375
CONSTRAINT p2_pkey PRIMARY KEY((k) HASH)
376376
)
377-
SPLIT INTO 6 TABLETS;
377+
SPLIT INTO 2 TABLETS;
378378

379379

380380
\if :use_roles
@@ -410,7 +410,7 @@ CREATE TABLE public.part_uniq_const (
410410
CONSTRAINT part_uniq_const_pkey PRIMARY KEY((v1) HASH, v3 ASC)
411411
)
412412
PARTITION BY RANGE (v1)
413-
SPLIT INTO 6 TABLETS;
413+
SPLIT INTO 2 TABLETS;
414414

415415

416416
\if :use_roles
@@ -445,7 +445,7 @@ CREATE TABLE public.part_uniq_const_30_50 (
445445
v3 integer NOT NULL,
446446
CONSTRAINT part_uniq_const_30_50_pkey PRIMARY KEY((v1) HASH, v3 ASC)
447447
)
448-
SPLIT INTO 6 TABLETS;
448+
SPLIT INTO 2 TABLETS;
449449

450450

451451
\if :use_roles
@@ -480,7 +480,7 @@ CREATE TABLE public.part_uniq_const_50_100 (
480480
v3 integer NOT NULL,
481481
CONSTRAINT part_uniq_const_50_100_pkey PRIMARY KEY((v1) HASH, v3 ASC)
482482
)
483-
SPLIT INTO 6 TABLETS;
483+
SPLIT INTO 2 TABLETS;
484484

485485

486486
\if :use_roles
@@ -515,7 +515,7 @@ CREATE TABLE public.part_uniq_const_default (
515515
v3 integer NOT NULL,
516516
CONSTRAINT part_uniq_const_default_pkey PRIMARY KEY((v1) HASH, v3 ASC)
517517
)
518-
SPLIT INTO 6 TABLETS;
518+
SPLIT INTO 2 TABLETS;
519519

520520

521521
\if :use_roles
@@ -666,7 +666,7 @@ CREATE TABLE public.rls_private (
666666
v text,
667667
CONSTRAINT rls_private_pkey PRIMARY KEY((k) HASH)
668668
)
669-
SPLIT INTO 6 TABLETS;
669+
SPLIT INTO 2 TABLETS;
670670

671671
ALTER TABLE ONLY public.rls_private FORCE ROW LEVEL SECURITY;
672672

@@ -702,7 +702,7 @@ CREATE TABLE public.rls_public (
702702
v text,
703703
CONSTRAINT rls_public_pkey PRIMARY KEY((k) HASH)
704704
)
705-
SPLIT INTO 6 TABLETS;
705+
SPLIT INTO 2 TABLETS;
706706

707707

708708
\if :use_roles
@@ -730,7 +730,7 @@ CREATE TABLE public.tbl1 (
730730
a integer NOT NULL,
731731
b integer
732732
)
733-
SPLIT INTO 6 TABLETS;
733+
SPLIT INTO 2 TABLETS;
734734

735735

736736
\if :use_roles
@@ -766,7 +766,7 @@ CREATE TABLE public.tbl10 (
766766
d integer,
767767
CONSTRAINT tbl10_pkey PRIMARY KEY((a, c) HASH, b ASC)
768768
)
769-
SPLIT INTO 6 TABLETS;
769+
SPLIT INTO 2 TABLETS;
770770

771771

772772
\if :use_roles
@@ -871,7 +871,7 @@ CREATE TABLE public.tbl13 (
871871
d integer,
872872
CONSTRAINT tbl13_pkey PRIMARY KEY((b, c) HASH)
873873
)
874-
SPLIT INTO 6 TABLETS;
874+
SPLIT INTO 2 TABLETS;
875875

876876

877877
\if :use_roles
@@ -927,7 +927,7 @@ SELECT pg_catalog.binary_upgrade_set_next_heap_relfilenode('16390'::pg_catalog.o
927927
CREATE TABLE public.tbl2 (
928928
a integer NOT NULL
929929
)
930-
SPLIT INTO 6 TABLETS;
930+
SPLIT INTO 2 TABLETS;
931931

932932

933933
\if :use_roles
@@ -1023,7 +1023,7 @@ CREATE TABLE public.tbl4 (
10231023
b integer NOT NULL,
10241024
CONSTRAINT tbl4_pkey PRIMARY KEY((a) HASH, b ASC)
10251025
)
1026-
SPLIT INTO 6 TABLETS;
1026+
SPLIT INTO 2 TABLETS;
10271027

10281028

10291029
\if :use_roles
@@ -1058,7 +1058,7 @@ CREATE TABLE public.tbl5 (
10581058
c integer,
10591059
CONSTRAINT tbl5_pkey PRIMARY KEY((a) HASH)
10601060
)
1061-
SPLIT INTO 6 TABLETS;
1061+
SPLIT INTO 2 TABLETS;
10621062

10631063

10641064
\if :use_roles
@@ -1091,7 +1091,7 @@ CREATE TABLE public.tbl6 (
10911091
a integer NOT NULL,
10921092
CONSTRAINT tbl6_pkey PRIMARY KEY((a) HASH)
10931093
)
1094-
SPLIT INTO 6 TABLETS;
1094+
SPLIT INTO 2 TABLETS;
10951095

10961096

10971097
\if :use_roles
@@ -1127,7 +1127,7 @@ CREATE TABLE public.tbl7 (
11271127
d integer,
11281128
CONSTRAINT tbl7_pkey PRIMARY KEY((b) HASH, c ASC)
11291129
)
1130-
SPLIT INTO 6 TABLETS;
1130+
SPLIT INTO 2 TABLETS;
11311131

11321132

11331133
\if :use_roles
@@ -1163,7 +1163,7 @@ CREATE TABLE public.tbl8 (
11631163
d integer NOT NULL,
11641164
CONSTRAINT tbl8_pkey PRIMARY KEY((a) HASH, d ASC)
11651165
)
1166-
SPLIT INTO 6 TABLETS;
1166+
SPLIT INTO 2 TABLETS;
11671167

11681168

11691169
\if :use_roles
@@ -1198,7 +1198,7 @@ CREATE TABLE public.tbl9 (
11981198
c integer,
11991199
CONSTRAINT tbl9_pkey PRIMARY KEY((a, b) HASH)
12001200
)
1201-
SPLIT INTO 6 TABLETS;
1201+
SPLIT INTO 2 TABLETS;
12021202

12031203

12041204
\if :use_roles
@@ -1892,7 +1892,7 @@ CREATE INDEX NONCONCURRENTLY level2_1_c3_idx ON public.level2_1 USING lsm (c3 AS
18921892
SELECT pg_catalog.binary_upgrade_set_next_index_pg_class_oid('16535'::pg_catalog.oid);
18931893
SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('16535'::pg_catalog.oid);
18941894

1895-
CREATE UNIQUE INDEX NONCONCURRENTLY non_unique_idx_with_include_clause ON public.hash_tbl_pk_with_include_clause USING lsm (k1 HASH, k2 ASC) INCLUDE (v) SPLIT INTO 6 TABLETS;
1895+
CREATE UNIQUE INDEX NONCONCURRENTLY non_unique_idx_with_include_clause ON public.hash_tbl_pk_with_include_clause USING lsm (k1 HASH, k2 ASC) INCLUDE (v) SPLIT INTO 2 TABLETS;
18961896

18971897

18981898
--
@@ -1904,7 +1904,7 @@ CREATE UNIQUE INDEX NONCONCURRENTLY non_unique_idx_with_include_clause ON public
19041904
SELECT pg_catalog.binary_upgrade_set_next_index_pg_class_oid('16424'::pg_catalog.oid);
19051905
SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('16424'::pg_catalog.oid);
19061906

1907-
CREATE INDEX NONCONCURRENTLY tbl8_idx ON public.tbl8 USING lsm ((b, c) HASH) SPLIT INTO 6 TABLETS;
1907+
CREATE INDEX NONCONCURRENTLY tbl8_idx ON public.tbl8 USING lsm ((b, c) HASH) SPLIT INTO 2 TABLETS;
19081908

19091909

19101910
--
@@ -1916,7 +1916,7 @@ CREATE INDEX NONCONCURRENTLY tbl8_idx ON public.tbl8 USING lsm ((b, c) HASH) SPL
19161916
SELECT pg_catalog.binary_upgrade_set_next_index_pg_class_oid('16425'::pg_catalog.oid);
19171917
SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('16425'::pg_catalog.oid);
19181918

1919-
CREATE INDEX NONCONCURRENTLY tbl8_idx2 ON public.tbl8 USING lsm (a HASH, b ASC) SPLIT INTO 6 TABLETS;
1919+
CREATE INDEX NONCONCURRENTLY tbl8_idx2 ON public.tbl8 USING lsm (a HASH, b ASC) SPLIT INTO 2 TABLETS;
19201920

19211921

19221922
--
@@ -1952,7 +1952,7 @@ CREATE INDEX NONCONCURRENTLY tbl8_idx4 ON public.tbl8 USING lsm (b DESC);
19521952
SELECT pg_catalog.binary_upgrade_set_next_index_pg_class_oid('16428'::pg_catalog.oid);
19531953
SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('16428'::pg_catalog.oid);
19541954

1955-
CREATE INDEX NONCONCURRENTLY tbl8_idx5 ON public.tbl8 USING lsm (c HASH) SPLIT INTO 6 TABLETS;
1955+
CREATE INDEX NONCONCURRENTLY tbl8_idx5 ON public.tbl8 USING lsm (c HASH) SPLIT INTO 2 TABLETS;
19561956

19571957

19581958
--
@@ -2012,7 +2012,7 @@ CREATE INDEX NONCONCURRENTLY tr2_c_idx ON public.tr2 USING lsm (c DESC) SPLIT AT
20122012
SELECT pg_catalog.binary_upgrade_set_next_index_pg_class_oid('16529'::pg_catalog.oid);
20132013
SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('16529'::pg_catalog.oid);
20142014

2015-
CREATE UNIQUE INDEX NONCONCURRENTLY unique_idx_with_include_clause ON public.range_tbl_pk_with_include_clause USING lsm (k1 HASH, k2 ASC) INCLUDE (v) SPLIT INTO 6 TABLETS;
2015+
CREATE UNIQUE INDEX NONCONCURRENTLY unique_idx_with_include_clause ON public.range_tbl_pk_with_include_clause USING lsm (k1 HASH, k2 ASC) INCLUDE (v) SPLIT INTO 2 TABLETS;
20162016

20172017

20182018
--

0 commit comments

Comments
 (0)