perf: optimize prebuilds membership reconciliation to check orgs not presets#20493
Merged
Conversation
1d3cbad to
9648569
Compare
9648569 to
9d47f64
Compare
johnstcn
reviewed
Oct 28, 2025
johnstcn
approved these changes
Oct 28, 2025
SasSwart
approved these changes
Oct 29, 2025
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
The membership reconciliation ensures the prebuilds system user is a member of all organizations with prebuilds configured. To support prebuilds quota management, each organization must have a prebuilds group that the system user belongs to.
Problem
Previously, membership reconciliation iterated over all presets to check and update membership status. This meant database queries
GetGroupByOrgAndNameandInsertGroupMemberwere executed for each preset. Since presets are unique combinations of(organization, template, template version, preset), this resulted in several redundant checks for the same organization.In dogfood,
InsertGroupMemberwas called thousands of times per day, even though memberships were already configured (internal Grafana dashboard link)Solution
This PR introduces
GetOrganizationsWithPrebuildStatus, a single query that returns:The membership reconciliation logic now:
O(presets)toO(organizations)per reconciliation loop, with a single read query when everything is configured.Changes
GetOrganizationsWithPrebuildStatusSQL querymembership.ReconcileAllto use organization-based reconciliation instead of preset-basedRelated to internal thread: https://codercom.slack.com/archives/C07GRNNRW03/p1760535570381369