Skip to content

feat: implement reconciliation loop #17261

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
merged 158 commits into from
Apr 17, 2025
Merged

feat: implement reconciliation loop #17261

Changes from 1 commit
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
300e80f
add prebuilds system user database changes and associated changes
SasSwart Mar 12, 2025
b788237
optionally prevent system users from counting to user count
dannykopping Mar 13, 2025
8122595
appease the linter
dannykopping Mar 13, 2025
bfb7c28
add unit test for system user behaviour
dannykopping Mar 13, 2025
6639167
reverting RBAC changes; not relevant here
dannykopping Mar 13, 2025
769ae1d
removing unnecessary changes
dannykopping Mar 13, 2025
e7e9c27
exclude system user db tests from non-linux OSs
dannykopping Mar 13, 2025
3936047
Rename prebuild system user reference
SasSwart Mar 17, 2025
8bdcafb
ensure that users.IsSystem is not nullable
SasSwart Mar 17, 2025
412d198
feat: add migrations and queries to support prebuilds
SasSwart Mar 12, 2025
51773ec
Simplify workspace_latest_build view
dannykopping Mar 14, 2025
23773c2
Revert test change
dannykopping Mar 17, 2025
bc3ff44
make gen
dannykopping Mar 17, 2025
7ff747e
mark prebuilds as such and set their preset ids
SasSwart Mar 17, 2025
baa3076
refactor: add comments to SQL queries
evgeniy-scherbina Mar 19, 2025
ed14fb3
test: added get-presets-backoff test
evgeniy-scherbina Mar 20, 2025
3cc74fb
refactor: add comment to SQL query
evgeniy-scherbina Mar 20, 2025
fc32154
refactor: add comments + improve tests
evgeniy-scherbina Mar 21, 2025
d7b4ec4
fix: bug in SQL
evgeniy-scherbina Mar 21, 2025
e8b53f7
test: minor changes to the test
evgeniy-scherbina Mar 21, 2025
9df6554
refactor: remove job_status from SQL query
evgeniy-scherbina Mar 21, 2025
ccc309e
refactor: embed preset_prebuilds table into presets table
evgeniy-scherbina Mar 21, 2025
ee1f16a
refactor: rename sql table
evgeniy-scherbina Mar 21, 2025
d040ddd
refactor: remove unnecessary JOIN
evgeniy-scherbina Mar 23, 2025
83a6722
refactor: remove unnecessary JOIN
evgeniy-scherbina Mar 23, 2025
cd70710
refactor: use INNER JOIN for consistency
evgeniy-scherbina Mar 23, 2025
97cc4ff
refactor: simplify GetPresetsBackoff SQL Query
evgeniy-scherbina Mar 24, 2025
4d59039
Revert "refactor: simplify GetPresetsBackoff SQL Query"
evgeniy-scherbina Mar 24, 2025
205d6af
refactor: improve GetPresetsBackoff query
evgeniy-scherbina Mar 24, 2025
e489e1b
Merge remote-tracking branch 'origin/main' into prebuilds-db
evgeniy-scherbina Mar 25, 2025
1b29686
Merge remote-tracking branch 'origin/main' into prebuilds-db
evgeniy-scherbina Mar 25, 2025
20470e4
fix: bump migration numbers
evgeniy-scherbina Mar 25, 2025
7b9c8ce
test: remove deprecated test
evgeniy-scherbina Mar 25, 2025
e189a0b
fix: fix linter
evgeniy-scherbina Mar 25, 2025
692c0e5
fix: fix 000310_prebuilds.down migration
evgeniy-scherbina Mar 25, 2025
f747db0
fix: fix fixture migration
evgeniy-scherbina Mar 25, 2025
3166a42
fix: fix get-presets-backoff test
evgeniy-scherbina Mar 25, 2025
aa6b490
fix: fix linter
evgeniy-scherbina Mar 25, 2025
bc4e7d2
fix: fix linter
evgeniy-scherbina Mar 25, 2025
f167b92
correctly select for the latest built with a preset in latest_prebuil…
SasSwart Mar 26, 2025
8fd34ab
Merge remote-tracking branch 'origin/main' into prebuilds-db
SasSwart Mar 26, 2025
7a8ec49
Properly label and filter metrics for prebuilds
SasSwart Mar 26, 2025
a64d661
test: fix db tests
evgeniy-scherbina Mar 27, 2025
c787cd2
test: added tests for workspaces with multiple agents
evgeniy-scherbina Mar 27, 2025
bd38603
refactor: avoid code duplication
evgeniy-scherbina Mar 27, 2025
097f9c3
clarify query clause
SasSwart Mar 27, 2025
4cfdd6f
tidy up dbauthz_test.go
SasSwart Mar 27, 2025
4a34d52
refactor: remove * usage from prebuilds.sql queries
evgeniy-scherbina Mar 27, 2025
8d9cd45
refactor: remove * usage from prebuilds views
evgeniy-scherbina Mar 27, 2025
f870d7e
refactor: join wlb with pj
evgeniy-scherbina Mar 27, 2025
18ad931
refactor: Rename SQL query
evgeniy-scherbina Mar 27, 2025
4667171
Added comments for SQL query
evgeniy-scherbina Mar 27, 2025
a26c094
refactor: fix down migration
evgeniy-scherbina Mar 27, 2025
6ed4121
Merge remote-tracking branch 'origin/main' into prebuilds-db
SasSwart Mar 28, 2025
2312f41
renumber migrations
SasSwart Mar 28, 2025
8da7f47
Merge remote-tracking branch 'origin/prebuilds-db' into 16930
SasSwart Mar 28, 2025
5150a5c
refactor: clarify comment for SQL query
evgeniy-scherbina Mar 28, 2025
bff34ea
refactor: fix indentations
evgeniy-scherbina Mar 28, 2025
ef462b6
refactor: rename helper func in test package
evgeniy-scherbina Mar 28, 2025
dc45165
refactor: database level tests
evgeniy-scherbina Mar 28, 2025
9c8a352
refactor: database level tests
evgeniy-scherbina Mar 28, 2025
eb80919
refactor: helper funcs in db-level tests
evgeniy-scherbina Mar 28, 2025
0b2bbee
refactor: minor improvement in SQL query
evgeniy-scherbina Mar 28, 2025
3a97bf6
refactor: rename SQL queries
evgeniy-scherbina Mar 28, 2025
2eeb884
refactor: rename SQL queries
evgeniy-scherbina Mar 28, 2025
73f99e8
refactor: rename fields in SQL query
evgeniy-scherbina Mar 31, 2025
c942753
add tests to ensure workspace builds that include a preset have it se…
SasSwart Apr 1, 2025
9badf7c
test to ensure we mark prebuilds as such
SasSwart Apr 1, 2025
6763ba2
make -B gen fmt
SasSwart Apr 1, 2025
e5117d7
add template_version_preset_id to mock types
SasSwart Apr 1, 2025
dfec884
Merge branch 'prebuilds-db' into 16930
SasSwart Apr 1, 2025
5065ad6
fix dbmem tests
SasSwart Apr 1, 2025
e354956
review notes. mostly rename isPrebuild to prebuild
SasSwart Apr 1, 2025
4d3aab6
Merge remote-tracking branch 'origin/main' into yevhenii/510-reconcil…
evgeniy-scherbina Apr 4, 2025
97b3886
fix dbmem tests
SasSwart Apr 1, 2025
fe60b56
feat: implement reconciliation loop
evgeniy-scherbina Apr 4, 2025
eeb0407
refactor: temporary commit - tests are passing
evgeniy-scherbina Apr 7, 2025
e807d02
refactor: remove DeterminePrebuildsState lock
evgeniy-scherbina Apr 9, 2025
d78675e
refactor: use TryAcquireLock
evgeniy-scherbina Apr 9, 2025
7f60a5d
refactor: Verify ActionType in state_test.go
evgeniy-scherbina Apr 9, 2025
8f5c9f9
refactor: minor refactor
evgeniy-scherbina Apr 9, 2025
42582e1
refactor: minor refactoring
evgeniy-scherbina Apr 9, 2025
14d924c
added comments
evgeniy-scherbina Apr 9, 2025
82e016c
mark prebuilds as such and set their preset ids
SasSwart Mar 17, 2025
c03ea52
add tests to ensure workspace builds that include a preset have it se…
SasSwart Apr 1, 2025
3693d45
test to ensure we mark prebuilds as such
SasSwart Apr 1, 2025
beb814f
make -B gen fmt
SasSwart Apr 1, 2025
a5418ac
add template_version_preset_id to mock types
SasSwart Apr 1, 2025
f4f9b17
fix dbmem tests
SasSwart Apr 1, 2025
d11fd58
go mod tidy && make -B gen
SasSwart Apr 10, 2025
31d3bf6
test: added few more tests
evgeniy-scherbina Apr 10, 2025
5007a83
refactor: remove redundant check for consistency
evgeniy-scherbina Apr 10, 2025
a79fe4c
refactor: use slice.Find instead of slice.Filter for backoff
evgeniy-scherbina Apr 10, 2025
c0246f4
refactor: make sure InProgress works on preset level as well
evgeniy-scherbina Apr 10, 2025
ed608cb
refactor: remove irrelevant comment
evgeniy-scherbina Apr 10, 2025
70223e4
refactor: add BackoffUntil to validateActions func
evgeniy-scherbina Apr 10, 2025
07808c2
refactor: CR's fixes
evgeniy-scherbina Apr 10, 2025
a2ceeb6
refactor: CR's fixes
evgeniy-scherbina Apr 10, 2025
73fb414
Remove todo
evgeniy-scherbina Apr 10, 2025
7e9c65f
minor refactoring
evgeniy-scherbina Apr 10, 2025
2ca8030
refactor: remove deprecated TODOs
evgeniy-scherbina Apr 10, 2025
ce83f92
refactor: slighly adjust comment
evgeniy-scherbina Apr 10, 2025
3bc4d8a
refactor: CR fixes
evgeniy-scherbina Apr 10, 2025
2986574
Remove deprecated TODO
evgeniy-scherbina Apr 10, 2025
aa22a8a
refactor: update comments
evgeniy-scherbina Apr 10, 2025
f41b19e
refactor: remove deprecated TODO
evgeniy-scherbina Apr 10, 2025
61a88e4
deduplicate test and add back proto field
SasSwart Apr 11, 2025
9ac7a2c
refactor: add RunLoop test
evgeniy-scherbina Apr 11, 2025
d0c2094
Merge remote-tracking branch 'origin/16930' into yevhenii/510-reconci…
evgeniy-scherbina Apr 11, 2025
474fc06
Fixes after merge
evgeniy-scherbina Apr 11, 2025
9fac5d7
refactor: simplify SQL query
evgeniy-scherbina Apr 11, 2025
868d0b6
refactor
evgeniy-scherbina Apr 11, 2025
5f204f2
minor fix
evgeniy-scherbina Apr 11, 2025
40b3e5f
minor fix
evgeniy-scherbina Apr 11, 2025
5e3adbc
make fmt
evgeniy-scherbina Apr 11, 2025
108720f
make lint
evgeniy-scherbina Apr 11, 2025
9d8f6b1
chore: fix gpg forwarding test (#17355)
deansheather Apr 11, 2025
b994eec
refactor: fix linter
evgeniy-scherbina Apr 11, 2025
eff754e
refactor: fix linter
evgeniy-scherbina Apr 11, 2025
4b052be
refactor: fix linter
evgeniy-scherbina Apr 11, 2025
bc5297c
refactor: fix linter
evgeniy-scherbina Apr 11, 2025
0989636
refactor: fix linter
evgeniy-scherbina Apr 11, 2025
2b57ac4
refactor: fix linter
evgeniy-scherbina Apr 11, 2025
41d7e07
fix: linter
evgeniy-scherbina Apr 11, 2025
ab5fa8f
fix: linter
evgeniy-scherbina Apr 11, 2025
f485bc0
refactor: fix linter
evgeniy-scherbina Apr 11, 2025
074f768
refactor: fix linter
evgeniy-scherbina Apr 11, 2025
a47627a
refactor: fix imports
evgeniy-scherbina Apr 11, 2025
eebb298
refactor: fix SQL comment
evgeniy-scherbina Apr 14, 2025
9a672dd
refactor: rename dblock
evgeniy-scherbina Apr 14, 2025
c2f4561
Merge remote-tracking branch 'origin/main' into yevhenii/510-reconcil…
evgeniy-scherbina Apr 14, 2025
62fb3f4
refactor: add test when create-prebuild helper fails
evgeniy-scherbina Apr 14, 2025
742d0d3
refactor: add additional check for create-prebuilds flow
evgeniy-scherbina Apr 15, 2025
f3e24b1
refactor: minor fixes in util.go
evgeniy-scherbina Apr 15, 2025
08aed24
refactor: minor fix in noop.go
evgeniy-scherbina Apr 15, 2025
951c8b5
refactor: add TestFilter in util/slice package
evgeniy-scherbina Apr 15, 2025
9c1e82f
refactor: add doc comments
evgeniy-scherbina Apr 15, 2025
46e240c
refactor: update comment
evgeniy-scherbina Apr 16, 2025
6dc1f68
fix: minor bug and add correspoding test
evgeniy-scherbina Apr 16, 2025
23964aa
fix: minor fix for logging
evgeniy-scherbina Apr 16, 2025
0a4d053
fix: CR's fixes
evgeniy-scherbina Apr 16, 2025
98d203d
fix: CR's fixes
evgeniy-scherbina Apr 16, 2025
145b9ff
fix: CR's fixes
evgeniy-scherbina Apr 16, 2025
8b91668
CR's fixes
evgeniy-scherbina Apr 16, 2025
cccdab2
Update coderd/prebuilds/preset_snapshot_test.go
evgeniy-scherbina Apr 16, 2025
a2e5643
Update coderd/prebuilds/preset_snapshot_test.go
evgeniy-scherbina Apr 16, 2025
1771c84
refactor: CR's fixes
evgeniy-scherbina Apr 16, 2025
1fc551d
refactor: CR's fixes
evgeniy-scherbina Apr 16, 2025
d99c5cb
refactor: CR's fixes
evgeniy-scherbina Apr 16, 2025
b98ccd4
fix: make sure prebuild is owned by prebuild user before deleting
evgeniy-scherbina Apr 16, 2025
936cc38
refactor: CR's fixes
evgeniy-scherbina Apr 16, 2025
32da1ab
refactor: CR's fixes
evgeniy-scherbina Apr 16, 2025
5a403c0
Update enterprise/coderd/prebuilds/reconcile.go
evgeniy-scherbina Apr 16, 2025
908e6eb
refactor: CR's fixes
evgeniy-scherbina Apr 16, 2025
77e4472
refactor: CR's fixes
evgeniy-scherbina Apr 17, 2025
853af80
refactor: CR's fixes
evgeniy-scherbina Apr 17, 2025
172177f
Merge remote-tracking branch 'origin/main' into yevhenii/510-reconcil…
evgeniy-scherbina Apr 17, 2025
a825bf0
refactor: reduce number of methods in Reconciler interface
evgeniy-scherbina Apr 17, 2025
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
Prev Previous commit
Next Next commit
refactor: CR's fixes
  • Loading branch information
@evgeniy-scherbina
evgeniy-scherbina committed Apr 16, 2025
commit 908e6eb967b5cde02732e3cb9586b6bac4bf24cc
1 change: 0 additions & 1 deletion enterprise/coderd/prebuilds/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres
slog.F("backoff_secs", math.Round(actions.BackoffUntil.Sub(c.clock.Now()).Seconds())),
)...)

// return ErrBackoff
return nil

case prebuilds.ActionTypeCreate:
Expand Down