- Notifications
You must be signed in to change notification settings - Fork1.1k
perf: optimize prebuilds membership reconciliation to check orgs not presets (#20493)#20555
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
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
…presets (#20493)The membership reconciliation ensures the prebuilds system user is amember of all organizations with prebuilds configured. To supportprebuilds quota management, each organization must have a prebuildsgroup that the system user belongs to.Previously, membership reconciliation iterated over all presets to checkand update membership status. This meant database queries`GetGroupByOrgAndName` and `InsertGroupMember` were executed for eachpreset. Since presets are unique combinations of `(organization,template, template version, preset)`, this resulted in several redundantchecks for the same organization.In dogfood, `InsertGroupMember` was called thousands of times per day,even though memberships were already configured ([internal Grafanadashboard link](https://grafana.dev.coder.com/goto/46MZ1UgDg?orgId=1))<img width="5382" height="1788" alt="Screenshot 2025-10-28 at 16 01 36"src="https://github.com/user-attachments/assets/757b7253-106f-4f72-8586-8e2ede9f18db"/>This PR introduces `GetOrganizationsWithPrebuildStatus`, a single querythat returns:* All unique organizations with prebuilds configured* Whether the prebuilds user is a member of each organization* Whether the prebuilds group exists in each organization* Whether the prebuilds user is in the prebuilds groupThe membership reconciliation logic now:* Fetches status for all organizations in one query* Only performs inserts for organizations missing required membershipsor groups* Safely handles concurrent operations via unique constraint violations* This reduces database load from `O(presets)` to `O(organizations)` perreconciliation loop, with a single read query when everything isconfigured.* Add `GetOrganizationsWithPrebuildStatus` SQL query* Update `membership.ReconcileAll` to use organization-basedreconciliation instead of preset-based* Update tests to reflect new behaviorRelated to internal thread:https://codercom.slack.com/archives/C07GRNNRW03/p1760535570381369(cherry picked from commit7e8fcb4)
david-fraley approved these changesOct 29, 2025
2cf4b5c intorelease/2.28 28 checks passed
Uh oh!
There was an error while loading.Please reload this page.
Sign up for freeto 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.
Related to PR:#20493
(cherry picked from commit7e8fcb4)