ILLDEV-463 Add batch action cleanup - #692
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds retention-based cleanup for batch action “run” events so the event table doesn’t grow indefinitely per scheduled batch task, and centralizes an int -> int32 clamping helper in broker/common.
Changes:
- Add a new SQLC query + scheduler repo method to delete old batch action runs beyond a configurable retention limit.
- Wire
SchedRepointoBatchActionServiceand invoke cleanup before dispatching the batch action handler. - Move
ToInt32clamping helper intobroker/commonand update call sites.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| broker/test/service/supplierlocator_test.go | Switches int→int32 conversion to common.ToInt32. |
| broker/sqlc/event_query.sql | Adds DeleteOldBatchActionRunEvents query for retention cleanup. |
| broker/service/supplierlocator.go | Uses common.ToInt32 and removes local helper. |
| broker/scheduler/service/batch_action.go | Adds retention env var, injects scheduler repo, and performs cleanup before dispatch. |
| broker/scheduler/service/batch_action_test.go | Updates constructor calls and adds tests for cleanup behavior. |
| broker/scheduler/db/repo.go | Exposes DeleteOldBatchActionRunEvents on SchedRepo and implements it. |
| broker/README.md | Documents BATCH_ACTION_RUN_RETENTION env var and reflows the env table. |
| broker/common/common.go | Adds shared ToInt32 clamping helper. |
| broker/app/app.go | Creates schedRepo once and wires it into BatchActionService and scheduler API/scheduler startup. |
Comments suppressed due to low confidence (1)
broker/scheduler/service/batch_action_test.go:186
- This test mutates the package-global BATCH_ACTION_RUN_RETENTION and resets it to 5, which may not be the original value (it can be overridden via env). Capture the original value and restore it via t.Cleanup to avoid leaking state across tests.
BATCH_ACTION_RUN_RETENTION = 0
status, result := svc.batchAction(testCtx, requestAgingEvent("cql.allRecords=1", map[string]any{"interval": "24h"}))
assert.Equal(t, events.EventStatusSuccess, status)
assert.NotNil(t, result)
assert.False(t, cleanupRepo.called)
assert.True(t, repo.listCalled)
BATCH_ACTION_RUN_RETENTION = 5
jakub-id
reviewed
Jul 27, 2026
jakub-id
reviewed
Jul 27, 2026
jakub-id
requested changes
Jul 27, 2026
JanisSaldabols
commented
Jul 28, 2026
JanisSaldabols
commented
Jul 28, 2026
Contributor
|
@JanisSaldabols it makes sense to leave the invoke-background-action events since they will be cleaned up when we clean up (archive) patron requests. Let's just clean up the parent field for this event so that we don't have dangling reference when the parent invoke-batch-action event is cleaned up. |
jakub-id
approved these changes
Jul 29, 2026
jakub-id
left a comment
jakub-id
left a comment
Contributor
There was a problem hiding this comment.
Approving with the above change request.
JanisSaldabols
force-pushed
the
ILLDEV-463
branch
from
July 30, 2026 07:21
6cef2e1 to
b6db822
Compare
JanisSaldabols
enabled auto-merge (squash)
July 30, 2026 07:22
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.