Skip to content

fix: Update github.com/coder/retry to remove initial delay #6160

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 6 commits into from
Feb 13, 2023
Merged

fix: Update github.com/coder/retry to remove initial delay #6160

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2ababe
fix: Update github.com/coder/retry to remove initial delay
mafredri Feb 10, 2023
6212a3c
Fix TestWorkspaceWatcher
mafredri Feb 10, 2023
ef0c946
Verify channel not closed, just in case
mafredri Feb 10, 2023
767087a
Increase reliability
mafredri Feb 10, 2023
0045806
Fix data race
mafredri Feb 10, 2023
e95ca7f
fixup! Fix data race
mafredri Feb 10, 2023
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
fixup! Fix data race
  • Loading branch information
@mafredri
mafredri committed Feb 10, 2023
commit e95ca7f861bc04c1678f82c8e5e0722f03e63185
28 changes: 18 additions & 10 deletions coderd/database/dbfake/databasefake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,28 +371,28 @@ func (q *fakeQuerier) GetTemplateAverageBuildTime(ctx context.Context, arg datab
deleteTimes []float64
)
q.mutex.RLock()
workspaceBuilds := slices.Clone(q.workspaceBuilds)
q.mutex.RUnlock()
for _, wb := range workspaceBuilds {
version, err := q.GetTemplateVersionByID(ctx, wb.TemplateVersionID)
defer q.mutex.RUnlock()
for _, wb := range q.workspaceBuilds {
version, err := q.getTemplateVersionByIDNoLock(ctx, wb.TemplateVersionID)
if err != nil {
return emptyRow, err
}
if version.TemplateID != arg.TemplateID {
continue
}

job, err := q.GetProvisionerJobByID(ctx, wb.JobID)
job, err := q.getProvisionerJobByIDNoLock(ctx, wb.JobID)
if err != nil {
return emptyRow, err
}
if job.CompletedAt.Valid {
took := job.CompletedAt.Time.Sub(job.StartedAt.Time).Seconds()
if wb.Transition == database.WorkspaceTransitionStart {
switch wb.Transition {
case database.WorkspaceTransitionStart:
startTimes = append(startTimes, took)
} else if wb.Transition == database.WorkspaceTransitionStop {
case database.WorkspaceTransitionStop:
stopTimes = append(stopTimes, took)
} else if wb.Transition == database.WorkspaceTransitionDelete {
case database.WorkspaceTransitionDelete:
deleteTimes = append(deleteTimes, took)
}
}
Expand Down Expand Up @@ -1800,10 +1800,14 @@ func (q *fakeQuerier) GetTemplateVersionParameters(_ context.Context, templateVe
return parameters, nil
}

func (q *fakeQuerier) GetTemplateVersionByID(_ context.Context, templateVersionID uuid.UUID) (database.TemplateVersion, error) {
func (q *fakeQuerier) GetTemplateVersionByID(ctx context.Context, templateVersionID uuid.UUID) (database.TemplateVersion, error) {
q.mutex.RLock()
defer q.mutex.RUnlock()

return q.getTemplateVersionByIDNoLock(ctx, templateVersionID)
}

func (q *fakeQuerier) getTemplateVersionByIDNoLock(_ context.Context, templateVersionID uuid.UUID) (database.TemplateVersion, error) {
for _, templateVersion := range q.templateVersions {
if templateVersion.ID != templateVersionID {
continue
Expand Down Expand Up @@ -2235,10 +2239,14 @@ func (q *fakeQuerier) GetWorkspaceAppByAgentIDAndSlug(_ context.Context, arg dat
return database.WorkspaceApp{}, sql.ErrNoRows
}

func (q *fakeQuerier) GetProvisionerJobByID(_ context.Context, id uuid.UUID) (database.ProvisionerJob, error) {
func (q *fakeQuerier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (database.ProvisionerJob, error) {
q.mutex.RLock()
defer q.mutex.RUnlock()

return q.getProvisionerJobByIDNoLock(ctx, id)
}

func (q *fakeQuerier) getProvisionerJobByIDNoLock(_ context.Context, id uuid.UUID) (database.ProvisionerJob, error) {
for _, provisionerJob := range q.provisionerJobs {
if provisionerJob.ID != id {
continue
Expand Down