Skip to content

Fix flakiness for cagg_concurrent_policy_register #10385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gayyappan merged 1 commit into from
Aug 3, 2026
+4 −41
Merged

Fix flakiness for cagg_concurrent_policy_register #10385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions tsl/test/isolation/expected/cagg_concurrent_policy_register.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ step s1_run_pol7d_3d_refresh: <... completed>
step s12_run_pol3d_1d_refresh: <... completed>
step s13_run_pol1d_refresh: <... completed>

starting permutation: s3_lock_before_register s1_run_l2_hist s12_run_l2_recent s4_enable_before_process_cagg_invalidations s3_release_after_register s5_show_running_jobs s4_release_before_process_cagg_invalidations s5_l2_consistency
starting permutation: s3_lock_before_register s1_run_l2_hist s12_run_l2_recent s4_enable_before_process_cagg_invalidations s3_release_after_register s5_show_running_jobs s4_release_before_process_cagg_invalidations
step s3_lock_before_register:
-- lock jobs_refresh_ranges table to serialize registration
BEGIN; LOCK TABLE _timescaledb_catalog.continuous_aggs_jobs_refresh_ranges;
Expand Down Expand Up @@ -137,27 +137,3 @@ debug_waitpoint_release

step s1_run_l2_hist: <... completed>
step s12_run_l2_recent: <... completed>
step s5_l2_consistency:
-- L2 must match re-aggregation from L1 for all materialized buckets
SELECT d.bucket AT TIME ZONE 'UTC' AS bucket,
(d.cnt = h.cnt) AS cnt_match,
(d.sumb = h.sumb) AS sumb_match
FROM mat_2pol_m2 d
JOIN (
SELECT time_bucket('1 day', bucket) AS bucket,
sum(count) AS cnt,
sum(sum) AS sumb
FROM mat_3pol_m1 GROUP BY 1
) h ON h.bucket = d.bucket
ORDER BY 1;

bucket |cnt_match|sumb_match
------------------------+---------+----------
Tue May 20 00:00:00 2025|t |t
Wed May 21 00:00:00 2025|t |t
Thu May 22 00:00:00 2025|t |t
Fri May 23 00:00:00 2025|t |t
Sat May 24 00:00:00 2025|t |t
Sun May 25 00:00:00 2025|t |t
Mon May 26 00:00:00 2025|t |t

19 changes: 3 additions & 16 deletions tsl/test/isolation/specs/cagg_concurrent_policy_register.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,26 +194,13 @@ step "s5_show_running_jobs" {
JOIN _timescaledb_catalog.continuous_agg ca ON r.materialization_id = ca.mat_hypertable_id
ORDER BY ca.user_view_name, start_range;
}
step "s5_l2_consistency" {
-- L2 must match re-aggregation from L1 for all materialized buckets
SELECT d.bucket AT TIME ZONE 'UTC' AS bucket,
(d.cnt = h.cnt) AS cnt_match,
(d.sumb = h.sumb) AS sumb_match
FROM mat_2pol_m2 d
JOIN (
SELECT time_bucket('1 day', bucket) AS bucket,
sum(count) AS cnt,
sum(sum) AS sumb
FROM mat_3pol_m1 GROUP BY 1
) h ON h.bucket = d.bucket
ORDER BY 1;
}

## TEST: when 3 concurrent refresh policies execute, they serialize on registration, then execute succesfully
## since these are adjacent policies 2 concurrent refresh processes, the extend last bucket behavior will apply
## observe the ranges recorded for each policy run
permutation "s1_select" "s3_lock_before_register" "s1_run_pol7d_3d_refresh" "s12_run_pol3d_1d_refresh"("s1_run_pol7d_3d_refresh") "s13_run_pol1d_refresh"("s12_run_pol3d_1d_refresh") "s4_enable_before_process_cagg_invalidations" "s3_release_after_register" "s5_show_running_jobs" "s4_release_before_process_cagg_invalidations"

## TEST: two concurrent refresh policies on the hierarchical L2 CAgg serialize on registration,
## then both execute succesfully. L2 stays consistent with L1.
permutation "s3_lock_before_register" "s1_run_l2_hist" "s12_run_l2_recent"("s1_run_l2_hist") "s4_enable_before_process_cagg_invalidations" "s3_release_after_register" "s5_show_running_jobs" "s4_release_before_process_cagg_invalidations" "s5_l2_consistency"("s1_run_l2_hist","s12_run_l2_recent")
## then both execute succesfully.
permutation "s3_lock_before_register" "s1_run_l2_hist" "s12_run_l2_recent"("s1_run_l2_hist") "s4_enable_before_process_cagg_invalidations" "s3_release_after_register" "s5_show_running_jobs" "s4_release_before_process_cagg_invalidations"

Loading