fixup! Fix data race

mafredri · mafredri · commit e95ca7f861bc · 2023-02-10T19:40:44.000Z
diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -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)
 			}
 		}
@@ -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
@@ -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
