Commitdecde5c

committed

Fix agent queue with loads of logs

1 parent379f1f4 commitdecde5cCopy full SHA for decde5c

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -666,6 +666,13 @@ func (a *agent) runScript(ctx context.Context, lifecycle, script string) error {`
`666`	`666`	`varflushLogsTimer*time.Timer`
`667`	`667`	`varlogMutex sync.Mutex`
`668`	`668`	`varlogsSendingbool`
	`669`	`+deferfunc() {`
	`670`	`+logMutex.Lock()`
	`671`	`+ifflushLogsTimer!=nil {`
	`672`	`+flushLogsTimer.Stop()`
	`673`	`+}`
	`674`	`+logMutex.Unlock()`
	`675`	`+}()`
`669`	`676`
`670`	`677`	`// sendLogs function uploads the queued logs to the server`
`671`	`678`	`sendLogs:=func() {`
`@@ -708,6 +715,7 @@ func (a *agent) runScript(ctx context.Context, lifecycle, script string) error {`
`708`	`715`	`// Reset logsSending flag`
`709`	`716`	`logMutex.Lock()`
`710`	`717`	`logsSending=false`
	`718`	`+flushLogsTimer.Reset(100*time.Millisecond)`
`711`	`719`	`logMutex.Unlock()`
`712`	`720`	`}`
`713`	`721`	`// queueLog function appends a log to the queue and triggers sendLogs if necessary`
`@@ -720,8 +728,10 @@ func (a *agent) runScript(ctx context.Context, lifecycle, script string) error {`
`720`	`728`
`721`	`729`	`// If there are more than 100 logs, send them immediately`
`722`	`730`	`iflen(queuedLogs)>100 {`
	`731`	`+// Don't early return after this, because we still want`
	`732`	`+// to reset the timer just in case logs come in while`
	`733`	`+// we're sending.`
`723`	`734`	`gosendLogs()`
`724`		`-return`
`725`	`735`	`}`
`726`	`736`	`// Reset or set the flushLogsTimer to trigger sendLogs after 100 milliseconds`
`727`	`737`	`ifflushLogsTimer!=nil {`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,10 @@ func workspaceAgent() *cobra.Command {`
`117`	`117`	`client:=agentsdk.New(coderURL)`
`118`	`118`	`client.SDK.Logger=logger`
`119`	`119`	`// Set a reasonable timeout so requests can't hang forever!`
`120`		`-client.SDK.HTTPClient.Timeout=10*time.Second`
	`120`	`+// The timeout needs to be reasonably long, because requests`
	`121`	`+// with large payloads can take a bit. e.g. startup scripts`
	`122`	`+// may take a while to insert.`
	`123`	`+client.SDK.HTTPClient.Timeout=30*time.Second`
`121`	`124`
`122`	`125`	`// Enable pprof handler`
`123`	`126`	`// This prevents the pprof import from being accidentally deleted.`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,17 @@ export const AgentRow: FC<AgentRowProps> = ({`
`97`	`97`	`returnlogs`
`98`	`98`	`},[logsMachine.context.startupLogs,agent.startup_logs_overflowed])`
`99`	`99`	`const[bottomOfLogs,setBottomOfLogs]=useState(true)`
	`100`	`+// This is a layout effect to remove flicker when we're scrolling to the bottom.`
`100`	`101`	`useLayoutEffect(()=>{`
	`102`	`+// If we're currently watching the bottom, we always want to stay at the bottom.`
`101`	`103`	`if(bottomOfLogs&&logListRef.current){`
`102`	`104`	`logListRef.current.scrollToItem(startupLogs.length-1,"end")`
`103`	`105`	`}`
`104`	`106`	`},[showStartupLogs,startupLogs,logListRef,bottomOfLogs])`
	`107`	`+`
	`108`	`+// This is a bit of a hack on the react-window API to get the scroll position.`
	`109`	`+// If we're scrolled to the bottom, we want to keep the list scrolled to the bottom.`
	`110`	`+// This makes it feel similar to a terminal that auto-scrolls downwards!`
`105`	`111`	`consthandleLogScroll=useCallback(`
`106`	`112`	`(props:ListOnScrollProps)=>{`
`107`	`113`	`if(`

Comments

(0)