Commitc85aa44

committed

fix(coderd/agentapi): setReadyAt for start timeout

1 parent0c423f0 commitc85aa44Copy full SHA for c85aa44

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 7 additions & 1 deletion

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

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)