Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitae7e908

Browse files
committed
remove nested transaction
1 parentb7288b1 commitae7e908

File tree

2 files changed

+31
-39
lines changed

2 files changed

+31
-39
lines changed

‎coderd/autobuild/executor/lifecycle_executor.go

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -220,43 +220,37 @@ func build(ctx context.Context, store database.Store, workspace database.Workspa
220220
returnxerrors.Errorf("Unsupported transition: %q",trans)
221221
}
222222

223-
err=store.InTx(func(db database.Store)error {
224-
newProvisionerJob,err:=db.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
225-
ID:provisionerJobID,
226-
CreatedAt:now,
227-
UpdatedAt:now,
228-
InitiatorID:workspace.OwnerID,
229-
OrganizationID:template.OrganizationID,
230-
Provisioner:template.Provisioner,
231-
Type:database.ProvisionerJobTypeWorkspaceBuild,
232-
StorageMethod:priorJob.StorageMethod,
233-
StorageSource:priorJob.StorageSource,
234-
Input:input,
235-
})
236-
iferr!=nil {
237-
returnxerrors.Errorf("insert provisioner job: %w",err)
238-
}
239-
_,err=db.InsertWorkspaceBuild(ctx, database.InsertWorkspaceBuildParams{
240-
ID:workspaceBuildID,
241-
CreatedAt:now,
242-
UpdatedAt:now,
243-
WorkspaceID:workspace.ID,
244-
TemplateVersionID:priorHistory.TemplateVersionID,
245-
BuildNumber:priorBuildNumber+1,
246-
Name:namesgenerator.GetRandomName(1),
247-
ProvisionerState:priorHistory.ProvisionerState,
248-
InitiatorID:workspace.OwnerID,
249-
Transition:trans,
250-
JobID:newProvisionerJob.ID,
251-
Reason:buildReason,
252-
})
253-
iferr!=nil {
254-
returnxerrors.Errorf("insert workspace build: %w",err)
255-
}
256-
returnnil
223+
newProvisionerJob,err:=store.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
224+
ID:provisionerJobID,
225+
CreatedAt:now,
226+
UpdatedAt:now,
227+
InitiatorID:workspace.OwnerID,
228+
OrganizationID:template.OrganizationID,
229+
Provisioner:template.Provisioner,
230+
Type:database.ProvisionerJobTypeWorkspaceBuild,
231+
StorageMethod:priorJob.StorageMethod,
232+
StorageSource:priorJob.StorageSource,
233+
Input:input,
234+
})
235+
iferr!=nil {
236+
returnxerrors.Errorf("insert provisioner job: %w",err)
237+
}
238+
_,err=store.InsertWorkspaceBuild(ctx, database.InsertWorkspaceBuildParams{
239+
ID:workspaceBuildID,
240+
CreatedAt:now,
241+
UpdatedAt:now,
242+
WorkspaceID:workspace.ID,
243+
TemplateVersionID:priorHistory.TemplateVersionID,
244+
BuildNumber:priorBuildNumber+1,
245+
Name:namesgenerator.GetRandomName(1),
246+
ProvisionerState:priorHistory.ProvisionerState,
247+
InitiatorID:workspace.OwnerID,
248+
Transition:trans,
249+
JobID:newProvisionerJob.ID,
250+
Reason:buildReason,
257251
})
258252
iferr!=nil {
259-
returnerr
253+
returnxerrors.Errorf("insert workspace build: %w",err)
260254
}
261255
returnnil
262256
}

‎coderd/autobuild/executor/lifecycle_executor_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ func TestExecutorAutostartOK(t *testing.T) {
5252
assert.Contains(t,stats.Transitions,workspace.ID)
5353
assert.Equal(t,database.WorkspaceTransitionStart,stats.Transitions[workspace.ID])
5454

55-
workspace,err:=client.Workspace(context.Background(),workspace.ID)
56-
assert.NoError(t,err)
55+
workspace=coderdtest.MustWorkspace(t,client,workspace.ID)
5756
assert.Equal(t,codersdk.BuildReasonAutostart,workspace.LatestBuild.Reason)
5857
}
5958

@@ -205,8 +204,7 @@ func TestExecutorAutostopOK(t *testing.T) {
205204
assert.Contains(t,stats.Transitions,workspace.ID)
206205
assert.Equal(t,database.WorkspaceTransitionStop,stats.Transitions[workspace.ID])
207206

208-
workspace,err:=client.Workspace(context.Background(),workspace.ID)
209-
assert.NoError(t,err)
207+
workspace=coderdtest.MustWorkspace(t,client,workspace.ID)
210208
assert.Equal(t,codersdk.BuildReasonAutostop,workspace.LatestBuild.Reason)
211209
}
212210

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp