Commit3485300

authored

fix(coderd): Ensure agent disconnect happens after timeout (#6600)

1 parent7587850 commit3485300Copy full SHA for 3485300

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,10 @@ func New(options Options) API {`
`175`	`175`	`ifoptions.AgentInactiveDisconnectTimeout==0 {`
`176`	`176`	`// Multiply the update by two to allow for some lag-time.`
`177`	`177`	`options.AgentInactiveDisconnectTimeout=options.AgentConnectionUpdateFrequency*2`
	`178`	`+// Set a minimum timeout to avoid disconnecting too soon.`
	`179`	`+ifoptions.AgentInactiveDisconnectTimeout<2*time.Second {`
	`180`	`+options.AgentInactiveDisconnectTimeout=2*time.Second`
	`181`	`+}`
`178`	`182`	`}`
`179`	`183`	`ifoptions.AgentStatsRefreshInterval==0 {`
`180`	`184`	`options.AgentStatsRefreshInterval=5*time.Minute`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ func (api API) workspaceAgentCoordinate(rw http.ResponseWriter, r http.Request`
`615`	`615`
`616`	`616`	// We use a custom heartbeat routine here instead of `httpapi.Heartbeat`
`617`	`617`	`// because we want to log the agent's last ping time.`
`618`		`-varlastPing time.Time`
	`618`	`+lastPing:=time.Now()// Since the agent initiated the request, assume it's alive.`
`619`	`619`	`varpingMu sync.Mutex`
`620`	`620`	`gopprof.Do(ctx,pprof.Labels("agent",workspaceAgent.ID.String()),func(ctx context.Context) {`
`621`	`621`	`// TODO(mafredri): Is this too frequent? Use separate ping disconnect timeout?`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ import (`
`23`	`23`
`24`	`24`	`funcTest_Runner(t*testing.T) {`
`25`	`25`	`t.Parallel()`
`26`		`-t.Skip("https://github.com/coder/coder/issues/6598")`
`27`	`26`
`28`	`27`	`t.Run("OK",func(t*testing.T) {`
`29`	`28`	`t.Parallel()`

Comments

(0)