Skip to content

Commit e81a985

Browse files
revert: cache
1 parent de6e6af commit e81a985

File tree

3 files changed

+4
-147
lines changed

3 files changed

+4
-147
lines changed

coderd/autobuild/cache.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

coderd/autobuild/cache_test.go

Lines changed: 0 additions & 84 deletions
This file was deleted.

coderd/autobuild/lifecycle_executor.go

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,6 @@ func (e *Executor) runOnce(t time.Time) Stats {
154154
// Limit the concurrency to avoid overloading the database.
155155
eg.SetLimit(10)
156156

157-
// We cache these values to help reduce load on the database.
158-
// These could be outdated during our execution, but this is
159-
// unlikely to be noticed or cause any unwanted behaviour.
160-
var (
161-
userCache = newCacheOf[uuid.UUID, database.User]()
162-
templateCache = newCacheOf[uuid.UUID, database.Template]()
163-
templateVersionCache = newCacheOf[uuid.UUID, database.TemplateVersion]()
164-
templateScheduleCache = newCacheOf[uuid.UUID, schedule.TemplateScheduleOptions]()
165-
)
166-
167157
for _, ws := range workspaces {
168158
wsID := ws.ID
169159
wsName := ws.Name
@@ -194,9 +184,7 @@ func (e *Executor) runOnce(t time.Time) Stats {
194184
return xerrors.Errorf("get workspace by id: %w", err)
195185
}
196186

197-
user, err := userCache.LoadOrStore(ws.OwnerID, func() (database.User, error) {
198-
return tx.GetUserByID(e.ctx, ws.OwnerID)
199-
})
187+
user, err := tx.GetUserByID(e.ctx, ws.OwnerID)
200188
if err != nil {
201189
return xerrors.Errorf("get user by id: %w", err)
202190
}
@@ -212,23 +200,17 @@ func (e *Executor) runOnce(t time.Time) Stats {
212200
return xerrors.Errorf("get latest provisioner job: %w", err)
213201
}
214202

215-
templateSchedule, err := templateScheduleCache.LoadOrStore(ws.TemplateID, func() (schedule.TemplateScheduleOptions, error) {
216-
return (*(e.templateScheduleStore.Load())).Get(e.ctx, tx, ws.TemplateID)
217-
})
203+
templateSchedule, err := (*(e.templateScheduleStore.Load())).Get(e.ctx, tx, ws.TemplateID)
218204
if err != nil {
219205
return xerrors.Errorf("get template scheduling options: %w", err)
220206
}
221207

222-
tmpl, err := templateCache.LoadOrStore(ws.TemplateID, func() (database.Template, error) {
223-
return tx.GetTemplateByID(e.ctx, ws.TemplateID)
224-
})
208+
tmpl, err := tx.GetTemplateByID(e.ctx, ws.TemplateID)
225209
if err != nil {
226210
return xerrors.Errorf("get template by ID: %w", err)
227211
}
228212

229-
activeTemplateVersion, err = templateVersionCache.LoadOrStore(tmpl.ActiveVersionID, func() (database.TemplateVersion, error) {
230-
return tx.GetTemplateVersionByID(e.ctx, tmpl.ActiveVersionID)
231-
})
213+
activeTemplateVersion, err = tx.GetTemplateVersionByID(e.ctx, tmpl.ActiveVersionID)
232214
if err != nil {
233215
return xerrors.Errorf("get active template version by ID: %w", err)
234216
}

0 commit comments

Comments
 (0)