fix: prevent duplicate merge suggestion workflow runs (CM-1217)#4173
Merged
Conversation
Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Temporal scheduling strategy in merge_suggestions_worker to prevent duplicate merge-suggestion generation by scheduling the actual generation workflows directly (for DEFAULT_TENANT_ID) instead of using short-lived spawner workflows whose abandoned child workflows could overlap across ticks.
Changes:
- Removed the “spawn for all tenants” workflows for member/org merge suggestions.
- Updated both schedules to start
generateMemberMergeSuggestions/generateOrganizationMergeSuggestionsdirectly withDEFAULT_TENANT_IDandBUFFER_ONEoverlap policy. - Standardized both schedules to an every-2-hours cron expression.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| services/apps/merge_suggestions_worker/src/workflows/spawnOrganizationMergeSuggestionsForAllTenants.ts | Removes the all-tenants spawner workflow for organization suggestions. |
| services/apps/merge_suggestions_worker/src/workflows/spawnMemberMergeSuggestionsForAllTenants.ts | Removes the all-tenants spawner workflow for member suggestions. |
| services/apps/merge_suggestions_worker/src/workflows.ts | Stops exporting the removed spawner workflows. |
| services/apps/merge_suggestions_worker/src/schedules/organizationMergeSuggestions.ts | Schedules generateOrganizationMergeSuggestions directly with DEFAULT_TENANT_ID on a 2-hour cron. |
| services/apps/merge_suggestions_worker/src/schedules/memberMergeSuggestions.ts | Schedules generateMemberMergeSuggestions directly with DEFAULT_TENANT_ID on a 2-hour cron. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Summary
Fixes duplicate merge suggestion generation runs by scheduling the actual generation workflows directly instead of scheduling short-lived spawner workflows that launched abandoned child workflows.
Previously, the schedule overlap policy only applied to the spawner workflow. Since the spawner completed quickly and its child workflows continued independently, later schedule ticks could start additional generation workflows for the same work. This caused multiple member/org merge suggestion workflows to run in parallel and potentially reprocess the same items.
Changes
generateMemberMergeSuggestionsdirectly withDEFAULT_TENANT_ID.generateOrganizationMergeSuggestionsdirectly withDEFAULT_TENANT_ID.BUFFER_ONEoverlap policy so only one generation run is active, with at most one buffered run.