Skip to content

Skip historical sweep when collectors resume after a gap (closes #892) #904

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
erikdarlingdata merged 1 commit into from
Apr 28, 2026
Merged

Skip historical sweep when collectors resume after a gap (closes #892) #904

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
36 changes: 36 additions & 0 deletions install/08_collect_query_stats.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,42 @@ BEGIN
@last_collection_time,
DATEADD(MINUTE, -ISNULL(@frequency_minutes, 15), SYSDATETIME())
);

/*
Resume detection: if this collector hasn't successfully run in a long time
(Off preset, Agent stoppage, server reboot, manual disable), skip the
historical sweep so we don't dump the entire plan cache into our deltas.
Threshold: 5x the configured frequency, floored at 30 minutes.
*/
DECLARE
@last_successful_run_time datetime2(7),
@resume_threshold_minutes integer;

SELECT
@last_successful_run_time = MAX(cl.collection_time)
FROM config.collection_log AS cl
WHERE cl.collector_name = N'query_stats_collector'
AND cl.collection_status = N'SUCCESS';

SET @resume_threshold_minutes =
CASE
WHEN ISNULL(@frequency_minutes, 0) <= 0 THEN 30
WHEN @frequency_minutes * 5 > 30 THEN @frequency_minutes * 5
ELSE 30
END;

IF @last_successful_run_time IS NOT NULL
AND DATEDIFF(MINUTE, @last_successful_run_time, SYSDATETIME()) > @resume_threshold_minutes
BEGIN
IF @debug = 1
BEGIN
DECLARE @gap_minutes integer = DATEDIFF(MINUTE, @last_successful_run_time, SYSDATETIME());
RAISERROR(N'Resume detected: %d-minute gap exceeds %d-minute threshold. Skipping historical sweep.', 0, 1,
@gap_minutes, @resume_threshold_minutes) WITH NOWAIT;
END;

SET @cutoff_time = SYSDATETIME();
END;
END;

IF @debug = 1
Expand Down
38 changes: 38 additions & 0 deletions install/09_collect_query_store.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,44 @@ BEGIN
),
0
);

/*
Resume detection: if this collector hasn't successfully run in a long time
(Off preset, Agent stoppage, server reboot, manual disable), skip the
historical sweep so we don't dump the entire Query Store window into our deltas.
Note: @last_collection_time above tracks the latest captured query execution time,
not the collector's run time, so we need a separate lookup against config.collection_log.
Threshold: 5x the configured frequency, floored at 30 minutes.
*/
DECLARE
@last_successful_run_time datetime2(7),
@resume_threshold_minutes integer;

SELECT
@last_successful_run_time = MAX(cl.collection_time)
FROM config.collection_log AS cl
WHERE cl.collector_name = N'query_store_collector'
AND cl.collection_status = N'SUCCESS';

SET @resume_threshold_minutes =
CASE
WHEN ISNULL(@collection_interval_minutes, 0) <= 0 THEN 30
WHEN @collection_interval_minutes * 5 > 30 THEN @collection_interval_minutes * 5
ELSE 30
END;

IF @last_successful_run_time IS NOT NULL
AND DATEDIFF(MINUTE, @last_successful_run_time, SYSDATETIME()) > @resume_threshold_minutes
BEGIN
IF @debug = 1
BEGIN
DECLARE @gap_minutes integer = DATEDIFF(MINUTE, @last_successful_run_time, SYSDATETIME());
RAISERROR(N'Resume detected: %d-minute gap exceeds %d-minute threshold. Skipping historical sweep.', 0, 1,
@gap_minutes, @resume_threshold_minutes) WITH NOWAIT;
END;

SET @cutoff_time = TODATETIMEOFFSET(SYSUTCDATETIME(), 0);
END;
END;

IF @debug = 1
Expand Down
36 changes: 36 additions & 0 deletions install/10_collect_procedure_stats.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,42 @@ BEGIN
SELECT
@cutoff_time = ISNULL(@last_collection_time,
DATEADD(MINUTE, -ISNULL(@frequency_minutes, 15), SYSDATETIME()));

/*
Resume detection: if this collector hasn't successfully run in a long time
(Off preset, Agent stoppage, server reboot, manual disable), skip the
historical sweep so we don't dump cumulative procedure stats into our deltas.
Threshold: 5x the configured frequency, floored at 30 minutes.
*/
DECLARE
@last_successful_run_time datetime2(7),
@resume_threshold_minutes integer;

SELECT
@last_successful_run_time = MAX(cl.collection_time)
FROM config.collection_log AS cl
WHERE cl.collector_name = N'procedure_stats_collector'
AND cl.collection_status = N'SUCCESS';

SET @resume_threshold_minutes =
CASE
WHEN ISNULL(@frequency_minutes, 0) <= 0 THEN 30
WHEN @frequency_minutes * 5 > 30 THEN @frequency_minutes * 5
ELSE 30
END;

IF @last_successful_run_time IS NOT NULL
AND DATEDIFF(MINUTE, @last_successful_run_time, SYSDATETIME()) > @resume_threshold_minutes
BEGIN
IF @debug = 1
BEGIN
DECLARE @gap_minutes integer = DATEDIFF(MINUTE, @last_successful_run_time, SYSDATETIME());
RAISERROR(N'Resume detected: %d-minute gap exceeds %d-minute threshold. Skipping historical sweep.', 0, 1,
@gap_minutes, @resume_threshold_minutes) WITH NOWAIT;
END;

SET @cutoff_time = SYSDATETIME();
END;
END;

IF @debug = 1
Expand Down
Loading