Commit35a808f

authored

fix(coderd/agentapi): setReadyAt for start timeout (#13846)

1 parentb07e306 commit35a808fCopy full SHA for 35a808f

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,13 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`209`	`209`	`casecodersdk.WorkspaceAgentLifecycleReady:`
`210`	`210`	`sw.Complete(stage,safeDuration(sw,agent.ReadyAt,agent.StartedAt))`
`211`	`211`	`casecodersdk.WorkspaceAgentLifecycleStartTimeout:`
`212`		`-sw.Fail(stage,0)`
	`212`	`+// Backwards compatibility: Avoid printing warning if`
	`213`	`+// coderd is old and doesn't set ReadyAt for timeouts.`
	`214`	`+ifagent.ReadyAt==nil {`
	`215`	`+sw.Fail(stage,0)`
	`216`	`+}else {`
	`217`	`+sw.Fail(stage,safeDuration(sw,agent.ReadyAt,agent.StartedAt))`
	`218`	`+}`
`213`	`219`	`sw.Log(time.Time{},codersdk.LogLevelWarn,"Warning: A startup script timed out and your workspace may be incomplete.")`
`214`	`220`	`casecodersdk.WorkspaceAgentLifecycleStartError:`
`215`	`221`	`sw.Fail(stage,safeDuration(sw,agent.ReadyAt,agent.StartedAt))`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ func TestAgent(t *testing.T) {`
`95`	`95`	`iter: []func(context.Context,testing.T,codersdk.WorkspaceAgent,<-chanstring,chan []codersdk.WorkspaceAgentLog)error{`
`96`	`96`	`func(_ context.Context,_testing.T,agentcodersdk.WorkspaceAgent,_<-chanstring,_chan []codersdk.WorkspaceAgentLog)error {`
`97`	`97`	`agent.Status=codersdk.WorkspaceAgentConnecting`
	`98`	`+agent.LifecycleState=codersdk.WorkspaceAgentLifecycleStarting`
	`99`	`+agent.StartedAt=ptr.Ref(time.Now())`
`98`	`100`	`returnnil`
`99`	`101`	`},`
`100`	`102`	`func(_ context.Context,ttesting.T,agentcodersdk.WorkspaceAgent,output<-chanstring,_chan []codersdk.WorkspaceAgentLog)error {`
`@@ -104,6 +106,7 @@ func TestAgent(t *testing.T) {`
`104`	`106`	`agent.Status=codersdk.WorkspaceAgentConnected`
`105`	`107`	`agent.LifecycleState=codersdk.WorkspaceAgentLifecycleStartTimeout`
`106`	`108`	`agent.FirstConnectedAt=ptr.Ref(time.Now())`
	`109`	`+agent.ReadyAt=ptr.Ref(time.Now())`
`107`	`110`	`returnnil`
`108`	`111`	`},`
`109`	`112`	`},`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,9 @@ func (a LifecycleAPI) UpdateLifecycle(ctx context.Context, req agentproto.Upda`
`98`	`98`	`// This agent is (re)starting, so it's not ready yet.`
`99`	`99`	`readyAt.Time= time.Time{}`
`100`	`100`	`readyAt.Valid=false`
`101`		`-casedatabase.WorkspaceAgentLifecycleStateReady,database.WorkspaceAgentLifecycleStateStartError:`
	`101`	`+casedatabase.WorkspaceAgentLifecycleStateReady,`
	`102`	`+database.WorkspaceAgentLifecycleStateStartTimeout,`
	`103`	`+database.WorkspaceAgentLifecycleStateStartError:`
`102`	`104`	`if!startedAt.Valid {`
`103`	`105`	`startedAt=dbChangedAt`
`104`	`106`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ func TestUpdateLifecycle(t *testing.T) {`
`275`	`275`	`ifstate==agentproto.Lifecycle_STARTING {`
`276`	`276`	`expectedStartedAt= sql.NullTime{Valid:true,Time:stateNow}`
`277`	`277`	`}`
`278`		`-ifstate==agentproto.Lifecycle_READY\|\|state==agentproto.Lifecycle_START_ERROR {`
	`278`	`+ifstate==agentproto.Lifecycle_READY\|\|state==agentproto.Lifecycle_START_TIMEOUT\|\|state==agentproto.Lifecycle_START_ERROR {`
`279`	`279`	`expectedReadyAt= sql.NullTime{Valid:true,Time:stateNow}`
`280`	`280`	`}`
`281`	`281`

Comments

(0)