Skip to content

Commit 0078f49

Browse files
melihmutlumelihmutlu
authored
Increase lock timeout in cagg_incremental_concurrent (#10344)
Increased lock timeout in cagg_incremental_concurrent to fix flakiness on macos.
1 parent 56f1656 commit 0078f49

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎tsl/test/isolation/expected/cagg_incremental_concurrent.out‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,23 @@ bucket|device_id|copies
9898

9999
starting permutation: wp_enable r1_run i1_insert s1_refresh_ranges r2_refresh s1_refresh_ranges s1_count wp_release s1_count s1_check_duplicates
100100
R1: LOG: statement:
101-
SET SESSION lock_timeout = '500ms';
101+
SET SESSION lock_timeout = '2s';
102102
SET SESSION deadlock_timeout = '500ms';
103103
SET SESSION client_min_messages = 'LOG';
104104

105105
R2: LOG: statement:
106-
SET SESSION lock_timeout = '500ms';
106+
SET SESSION lock_timeout = '2s';
107107
SET SESSION deadlock_timeout = '500ms';
108108
SET SESSION client_min_messages = 'LOG';
109109

110110
R3: LOG: statement:
111-
SET SESSION lock_timeout = '500ms';
111+
SET SESSION lock_timeout = '2s';
112112
SET SESSION deadlock_timeout = '500ms';
113113
SET SESSION client_min_messages = 'LOG';
114114
SET timescaledb.current_timestamp_mock TO '2026-04-01 00:30:00+00';
115115

116116
R4: LOG: statement:
117-
SET SESSION lock_timeout = '500ms';
117+
SET SESSION lock_timeout = '2s';
118118
SET SESSION deadlock_timeout = '500ms';
119119
SET SESSION client_min_messages = 'LOG';
120120

@@ -231,23 +231,23 @@ bucket|device_id|copies
231231

232232
starting permutation: wp_enable r1_run s1_refresh_ranges r2_refresh_overlap wp_release s1_count s1_check_duplicates
233233
R1: LOG: statement:
234-
SET SESSION lock_timeout = '500ms';
234+
SET SESSION lock_timeout = '2s';
235235
SET SESSION deadlock_timeout = '500ms';
236236
SET SESSION client_min_messages = 'LOG';
237237

238238
R2: LOG: statement:
239-
SET SESSION lock_timeout = '500ms';
239+
SET SESSION lock_timeout = '2s';
240240
SET SESSION deadlock_timeout = '500ms';
241241
SET SESSION client_min_messages = 'LOG';
242242

243243
R3: LOG: statement:
244-
SET SESSION lock_timeout = '500ms';
244+
SET SESSION lock_timeout = '2s';
245245
SET SESSION deadlock_timeout = '500ms';
246246
SET SESSION client_min_messages = 'LOG';
247247
SET timescaledb.current_timestamp_mock TO '2026-04-01 00:30:00+00';
248248

249249
R4: LOG: statement:
250-
SET SESSION lock_timeout = '500ms';
250+
SET SESSION lock_timeout = '2s';
251251
SET SESSION deadlock_timeout = '500ms';
252252
SET SESSION client_min_messages = 'LOG';
253253

@@ -352,23 +352,23 @@ bucket|device_id|copies
352352

353353
starting permutation: wp_enable r3_run i2_insert wp_release
354354
R1: LOG: statement:
355-
SET SESSION lock_timeout = '500ms';
355+
SET SESSION lock_timeout = '2s';
356356
SET SESSION deadlock_timeout = '500ms';
357357
SET SESSION client_min_messages = 'LOG';
358358

359359
R2: LOG: statement:
360-
SET SESSION lock_timeout = '500ms';
360+
SET SESSION lock_timeout = '2s';
361361
SET SESSION deadlock_timeout = '500ms';
362362
SET SESSION client_min_messages = 'LOG';
363363

364364
R3: LOG: statement:
365-
SET SESSION lock_timeout = '500ms';
365+
SET SESSION lock_timeout = '2s';
366366
SET SESSION deadlock_timeout = '500ms';
367367
SET SESSION client_min_messages = 'LOG';
368368
SET timescaledb.current_timestamp_mock TO '2026-04-01 00:30:00+00';
369369

370370
R4: LOG: statement:
371-
SET SESSION lock_timeout = '500ms';
371+
SET SESSION lock_timeout = '2s';
372372
SET SESSION deadlock_timeout = '500ms';
373373
SET SESSION client_min_messages = 'LOG';
374374

@@ -448,23 +448,23 @@ step r3_run: <... completed>
448448

449449
starting permutation: wp_enable r3_run_oldest_first i2_insert wp_release
450450
R1: LOG: statement:
451-
SET SESSION lock_timeout = '500ms';
451+
SET SESSION lock_timeout = '2s';
452452
SET SESSION deadlock_timeout = '500ms';
453453
SET SESSION client_min_messages = 'LOG';
454454

455455
R2: LOG: statement:
456-
SET SESSION lock_timeout = '500ms';
456+
SET SESSION lock_timeout = '2s';
457457
SET SESSION deadlock_timeout = '500ms';
458458
SET SESSION client_min_messages = 'LOG';
459459

460460
R3: LOG: statement:
461-
SET SESSION lock_timeout = '500ms';
461+
SET SESSION lock_timeout = '2s';
462462
SET SESSION deadlock_timeout = '500ms';
463463
SET SESSION client_min_messages = 'LOG';
464464
SET timescaledb.current_timestamp_mock TO '2026-04-01 00:30:00+00';
465465

466466
R4: LOG: statement:
467-
SET SESSION lock_timeout = '500ms';
467+
SET SESSION lock_timeout = '2s';
468468
SET SESSION deadlock_timeout = '500ms';
469469
SET SESSION client_min_messages = 'LOG';
470470

@@ -544,23 +544,23 @@ step r3_run_oldest_first: <... completed>
544544

545545
starting permutation: wp_enable r4_run s1_refresh_ranges s1_count r2_refresh wp_release s1_count s1_check_duplicates
546546
R1: LOG: statement:
547-
SET SESSION lock_timeout = '500ms';
547+
SET SESSION lock_timeout = '2s';
548548
SET SESSION deadlock_timeout = '500ms';
549549
SET SESSION client_min_messages = 'LOG';
550550

551551
R2: LOG: statement:
552-
SET SESSION lock_timeout = '500ms';
552+
SET SESSION lock_timeout = '2s';
553553
SET SESSION deadlock_timeout = '500ms';
554554
SET SESSION client_min_messages = 'LOG';
555555

556556
R3: LOG: statement:
557-
SET SESSION lock_timeout = '500ms';
557+
SET SESSION lock_timeout = '2s';
558558
SET SESSION deadlock_timeout = '500ms';
559559
SET SESSION client_min_messages = 'LOG';
560560
SET timescaledb.current_timestamp_mock TO '2026-04-01 00:30:00+00';
561561

562562
R4: LOG: statement:
563-
SET SESSION lock_timeout = '500ms';
563+
SET SESSION lock_timeout = '2s';
564564
SET SESSION deadlock_timeout = '500ms';
565565
SET SESSION client_min_messages = 'LOG';
566566

@@ -644,23 +644,23 @@ bucket|device_id|copies
644644

645645
starting permutation: wp_enable r4_run s1_refresh_ranges r2_refresh_overlap wp_release s1_count s1_check_duplicates
646646
R1: LOG: statement:
647-
SET SESSION lock_timeout = '500ms';
647+
SET SESSION lock_timeout = '2s';
648648
SET SESSION deadlock_timeout = '500ms';
649649
SET SESSION client_min_messages = 'LOG';
650650

651651
R2: LOG: statement:
652-
SET SESSION lock_timeout = '500ms';
652+
SET SESSION lock_timeout = '2s';
653653
SET SESSION deadlock_timeout = '500ms';
654654
SET SESSION client_min_messages = 'LOG';
655655

656656
R3: LOG: statement:
657-
SET SESSION lock_timeout = '500ms';
657+
SET SESSION lock_timeout = '2s';
658658
SET SESSION deadlock_timeout = '500ms';
659659
SET SESSION client_min_messages = 'LOG';
660660
SET timescaledb.current_timestamp_mock TO '2026-04-01 00:30:00+00';
661661

662662
R4: LOG: statement:
663-
SET SESSION lock_timeout = '500ms';
663+
SET SESSION lock_timeout = '2s';
664664
SET SESSION deadlock_timeout = '500ms';
665665
SET SESSION client_min_messages = 'LOG';
666666

‎tsl/test/isolation/specs/cagg_incremental_concurrent.spec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ step "wp_release"
182182
session "R1"
183183
setup
184184
{
185-
SET SESSION lock_timeout = '500ms';
185+
SET SESSION lock_timeout = '2s';
186186
SET SESSION deadlock_timeout = '500ms';
187187
SET SESSION client_min_messages = 'LOG';
188188
}
@@ -204,7 +204,7 @@ step "r1_run"
204204
session "R2"
205205
setup
206206
{
207-
SET SESSION lock_timeout = '500ms';
207+
SET SESSION lock_timeout = '2s';
208208
SET SESSION deadlock_timeout = '500ms';
209209
SET SESSION client_min_messages = 'LOG';
210210
}
@@ -258,7 +258,7 @@ step "s1_refresh_ranges"
258258
session "R3"
259259
setup
260260
{
261-
SET SESSION lock_timeout = '500ms';
261+
SET SESSION lock_timeout = '2s';
262262
SET SESSION deadlock_timeout = '500ms';
263263
SET SESSION client_min_messages = 'LOG';
264264
SET timescaledb.current_timestamp_mock TO '2026-04-01 00:30:00+00';
@@ -301,7 +301,7 @@ step "r3_run_oldest_first"
301301
session "R4"
302302
setup
303303
{
304-
SET SESSION lock_timeout = '500ms';
304+
SET SESSION lock_timeout = '2s';
305305
SET SESSION deadlock_timeout = '500ms';
306306
SET SESSION client_min_messages = 'LOG';
307307
}

0 commit comments

Comments
 (0)