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

fix(coderd/provisionerdserver): workaround lack of coder_ai_task resource on stop transition#19560

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
johnstcn merged 3 commits intomainfromcj/hack/set-has-ai-task
Aug 27, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
31 changes: 31 additions & 0 deletionscoderd/provisionerdserver/provisionerdserver.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1995,6 +1995,37 @@ func (s *server) completeWorkspaceBuildJob(ctx context.Context, job database.Pro
sidebarAppID= uuid.NullUUID{UUID:id,Valid:true}
}

// This is a hacky workaround for the issue with tasks 'disappearing' on stop:
// reuse has_ai_task and sidebar_app_id from the previous build.
// This workaround should be removed as soon as possible.
ifworkspaceBuild.Transition==database.WorkspaceTransitionStop&&workspaceBuild.BuildNumber>1 {
ifprevBuild,err:=s.Database.GetWorkspaceBuildByWorkspaceIDAndBuildNumber(ctx, database.GetWorkspaceBuildByWorkspaceIDAndBuildNumberParams{
WorkspaceID:workspaceBuild.WorkspaceID,
BuildNumber:workspaceBuild.BuildNumber-1,
});err==nil {
hasAITask=prevBuild.HasAITask.Bool
sidebarAppID=prevBuild.AITaskSidebarAppID
warnUnknownSidebarAppID=false
s.Logger.Debug(ctx,"task workaround: reused has_ai_task and sidebar_app_id from previous build to keep track of task",
slog.F("job_id",job.ID.String()),
slog.F("build_number",prevBuild.BuildNumber),
slog.F("workspace_id",workspace.ID),
slog.F("workspace_build_id",workspaceBuild.ID),
slog.F("transition",string(workspaceBuild.Transition)),
slog.F("sidebar_app_id",sidebarAppID.UUID),
slog.F("has_ai_task",hasAITask),
)
}else {
s.Logger.Error(ctx,"task workaround: tracking via has_ai_task and sidebar_app from previous build failed",
slog.Error(err),
slog.F("job_id",job.ID.String()),
slog.F("workspace_id",workspace.ID),
slog.F("workspace_build_id",workspaceBuild.ID),
slog.F("transition",string(workspaceBuild.Transition)),
)
}
}

ifwarnUnknownSidebarAppID {
// Ref: https://github.com/coder/coder/issues/18776
// This can happen for a number of reasons:
Expand Down
84 changes: 83 additions & 1 deletioncoderd/provisionerdserver/provisionerdserver_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2842,9 +2842,12 @@ func TestCompleteJob(t *testing.T) {
// has_ai_task has a default value of nil, but once the workspace build completes it will have a value;
// it is set to "true" if the related template has any coder_ai_task resources defined, and its sidebar app ID
// will be set as well in that case.
// HACK(johnstcn): we also set it to "true" if any _previous_ workspace builds ever had it set to "true".
// This is to avoid tasks "disappearing" when you stop them.
t.Run("WorkspaceBuild",func(t*testing.T) {
typetestcasestruct {
namestring
seedFuncfunc(context.Context, testing.TB, database.Store)error// If you need to insert other resources
transition database.WorkspaceTransition
input*proto.CompletedJob_WorkspaceBuild
expectHasAiTaskbool
Expand DownExpand Up@@ -2944,6 +2947,17 @@ func TestCompleteJob(t *testing.T) {
expectHasAiTask:true,
expectUsageEvent:false,
},
{
name:"current build does not have ai task but previous build did",
seedFunc:seedPreviousWorkspaceStartWithAITask,
transition:database.WorkspaceTransitionStop,
input:&proto.CompletedJob_WorkspaceBuild{
AiTasks: []*sdkproto.AITask{},
Resources: []*sdkproto.Resource{},
},
expectHasAiTask:true,
expectUsageEvent:false,
},
} {
t.Run(tc.name,func(t*testing.T) {
t.Parallel()
Expand DownExpand Up@@ -2980,6 +2994,9 @@ func TestCompleteJob(t *testing.T) {
})

ctx:=testutil.Context(t,testutil.WaitShort)
iftc.seedFunc!=nil {
require.NoError(t,tc.seedFunc(ctx,t,db))
}

buildJobID:=uuid.New()
wsBuildID:=uuid.New()
Expand All@@ -2999,8 +3016,13 @@ func TestCompleteJob(t *testing.T) {
Tags:pd.Tags,
})
require.NoError(t,err)
varbuildNumint32
iflatestBuild,err:=db.GetLatestWorkspaceBuildByWorkspaceID(ctx,workspaceTable.ID);err==nil {
buildNum=latestBuild.BuildNumber
}
build:=dbgen.WorkspaceBuild(t,db, database.WorkspaceBuild{
ID:wsBuildID,
BuildNumber:buildNum+1,
JobID:buildJobID,
WorkspaceID:workspaceTable.ID,
TemplateVersionID:version.ID,
Expand DownExpand Up@@ -3038,7 +3060,7 @@ func TestCompleteJob(t *testing.T) {
require.True(t,build.HasAITask.Valid)// We ALWAYS expect a value to be set, therefore not nil, i.e. valid = true.
require.Equal(t,tc.expectHasAiTask,build.HasAITask.Bool)

iftc.expectHasAiTask {
iftc.expectHasAiTask&&build.Transition!=database.WorkspaceTransitionStop{
require.Equal(t,sidebarAppID,build.AITaskSidebarAppID.UUID.String())
}

Expand DownExpand Up@@ -4244,3 +4266,63 @@ func (f *fakeUsageInserter) InsertDiscreteUsageEvent(_ context.Context, _ databa
f.collectedEvents=append(f.collectedEvents,event)
returnnil
}

funcseedPreviousWorkspaceStartWithAITask(ctx context.Context,t testing.TB,db database.Store)error {
t.Helper()
// If the below looks slightly convoluted, that's because it is.
// The workspace doesn't yet have a latest build, so querying all
// workspaces will fail.
tpls,err:=db.GetTemplates(ctx)
iferr!=nil {
returnxerrors.Errorf("seedFunc: get template: %w",err)
}
iflen(tpls)!=1 {
returnxerrors.Errorf("seedFunc: expected exactly one template, got %d",len(tpls))
}
ws,err:=db.GetWorkspacesByTemplateID(ctx,tpls[0].ID)
iferr!=nil {
returnxerrors.Errorf("seedFunc: get workspaces: %w",err)
}
iflen(ws)!=1 {
returnxerrors.Errorf("seedFunc: expected exactly one workspace, got %d",len(ws))
}
w:=ws[0]
prevJob:=dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
OrganizationID:w.OrganizationID,
InitiatorID:w.OwnerID,
Type:database.ProvisionerJobTypeWorkspaceBuild,
})
tvs,err:=db.GetTemplateVersionsByTemplateID(ctx, database.GetTemplateVersionsByTemplateIDParams{
TemplateID:tpls[0].ID,
})
iferr!=nil {
returnxerrors.Errorf("seedFunc: get template version: %w",err)
}
iflen(tvs)!=1 {
returnxerrors.Errorf("seedFunc: expected exactly one template version, got %d",len(tvs))
}
iftpls[0].ActiveVersionID==uuid.Nil {
returnxerrors.Errorf("seedFunc: active version id is nil")
}
res:=dbgen.WorkspaceResource(t,db, database.WorkspaceResource{
JobID:prevJob.ID,
})
agt:=dbgen.WorkspaceAgent(t,db, database.WorkspaceAgent{
ResourceID:res.ID,
})
wa:=dbgen.WorkspaceApp(t,db, database.WorkspaceApp{
AgentID:agt.ID,
})
_=dbgen.WorkspaceBuild(t,db, database.WorkspaceBuild{
BuildNumber:1,
HasAITask: sql.NullBool{Valid:true,Bool:true},
AITaskSidebarAppID: uuid.NullUUID{Valid:true,UUID:wa.ID},
ID:w.ID,
InitiatorID:w.OwnerID,
JobID:prevJob.ID,
TemplateVersionID:tvs[0].ID,
Transition:database.WorkspaceTransitionStart,
WorkspaceID:w.ID,
})
returnnil
}
[8]ページ先頭
©2009-2025 Movatter.jp