Skip to content

fix: avoid missed logs when streaming startup logs #8029

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 16, 2023
Merged

fix: avoid missed logs when streaming startup logs #8029

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
624e367
fix: Send startup log EOF and prevent lost messages
mafredri Jun 14, 2023
f35acd0
Merge branch 'main' into mafredri/fix-coderd-startup-log-eof
mafredri Jun 15, 2023
6fe8045
Ensure startup logs are closed on lifecycle state change
mafredri Jun 16, 2023
033262e
fix(codersdk): Fix startup log channel corruption
mafredri Jun 16, 2023
96c1ccd
Merge branch 'main' into mafredri/fix-coderd-startup-log-eof
mafredri Jun 16, 2023
1b58971
fix(site): Unshow the eof log line from WebUI
mafredri Jun 16, 2023
bcbec3e
Fix lint
mafredri Jun 16, 2023
eb7a7a3
Make EOF during lifecycle change mandatory
mafredri Jun 16, 2023
0dcfd73
Fix
mafredri Jun 16, 2023
a1a40f3
Fix after qp
mafredri Jun 16, 2023
9a49172
Merge branch 'main' into mafredri/fix-coderd-startup-log-eof
mafredri Jun 16, 2023
71f476a
Fix
mafredri Jun 16, 2023
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
Prev Previous commit
Next Next commit
Fix
  • Loading branch information
@mafredri
mafredri committed Jun 16, 2023
commit 0dcfd731ef39fc3c68ab0ebc9f06906a029fb473
3 changes: 2 additions & 1 deletion coderd/workspaceagents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1628,9 +1628,10 @@ func (api *API) workspaceAgentReportLifecycle(rw http.ResponseWriter, r *http.Re
EOF: []bool{true},
OutputLength: 0,
})
return xerrors.Errorf("write EOF log entry", err)
return xerrors.Errorf("write EOF log entry: %w", err)
}, nil)
if err != nil {
logger.Warn(ctx, "failed to mark startup logs as complete", slog.Error(err))
// If this fails, we want the agent to keep trying so that the
// startup log is eventually marked as complete.
httpapi.InternalServerError(rw, err)
Expand Down