init fix of multi connection race condition

bcpeinhardt · bcpeinhardt · commit fc1fd3e0fd69 · 2025-08-20T13:34:00.000-05:00
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -446,7 +446,6 @@ func WorkspaceBuild(t testing.TB, db database.Store, orig database.WorkspaceBuil
 			UpdatedAt:         takeFirst(orig.UpdatedAt, dbtime.Now()),
 			WorkspaceID:       takeFirst(orig.WorkspaceID, uuid.New()),
 			TemplateVersionID: takeFirst(orig.TemplateVersionID, uuid.New()),
-			BuildNumber:       takeFirst(orig.BuildNumber, 1),
 			Transition:        takeFirst(orig.Transition, database.WorkspaceTransitionStart),
 			InitiatorID:       takeFirst(orig.InitiatorID, uuid.New()),
 			JobID:             jobID,
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspacebuilds.sql b/coderd/database/queries/workspacebuilds.sql
@@ -110,7 +110,9 @@ INSERT INTO
 		template_version_preset_id
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14);
+	($1, $2, $3, $4, $5,
+	COALESCE((SELECT MAX("build_number") + 1 FROM workspace_builds WHERE workspace_id = $4), 1),
+	$6, $7, $8, $9, $10, $11, $12, $13);
 
 -- name: UpdateWorkspaceBuildCostByID :exec
 UPDATE
diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go
@@ -432,10 +432,7 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object
 	if err != nil {
 		return nil, nil, nil, BuildError{http.StatusInternalServerError, "compute template version ID", err}
 	}
-	buildNum, err := b.getBuildNumber()
-	if err != nil {
-		return nil, nil, nil, BuildError{http.StatusInternalServerError, "compute build number", err}
-	}
+
 	state, err := b.getState()
 	if err != nil {
 		return nil, nil, nil, BuildError{http.StatusInternalServerError, "compute build state", err}
@@ -463,7 +460,6 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object
 			UpdatedAt:         now,
 			WorkspaceID:       b.workspace.ID,
 			TemplateVersionID: templateVersionID,
-			BuildNumber:       buildNum,
 			ProvisionerState:  state,
 			InitiatorID:       b.initiator,
 			Transition:        b.trans,
@@ -716,18 +712,6 @@ func (b *Builder) firstBuild() (bool, error) {
 	return false, nil
 }
 
-func (b *Builder) getBuildNumber() (int32, error) {
-	bld, err := b.getLastBuild()
-	if xerrors.Is(err, sql.ErrNoRows) {
-		// first build!
-		return 1, nil
-	}
-	if err != nil {
-		return 0, xerrors.Errorf("get last build to compute build number: %w", err)
-	}
-	return bld.BuildNumber + 1, nil
-}
-
 func (b *Builder) getState() ([]byte, error) {
 	if b.state.orphan {
 		// Orphan means empty state.
