Skip to content

fix pubsub/poll race on provisioner job logs #2783

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

Jump to bottom
Merged
merged 3 commits into from
Jul 1, 2022
Merged

fix pubsub/poll race on provisioner job logs #2783

merged 3 commits into from
Jul 1, 2022

Conversation

spikecurtis
Copy link
Contributor

Fixes #2603

@spikecurtis
fix pubsub/poll race on provisioner job logs
422e543 
Signed-off-by: Spike Curtis <spike@coder.com>
@spikecurtis spikecurtis requested a review from a team July 1, 2022 18:26
@spikecurtis
only cancel on non-error
e8674d4 
Signed-off-by: Spike Curtis <spike@coder.com>
Emyrk
Emyrk approved these changes Jul 1, 2022
View reviewed changes
Copy link
Member

@Emyrk Emyrk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this EOF type thing 👍

dwahler
dwahler approved these changes Jul 1, 2022
View reviewed changes
Copy link
Contributor

@dwahler dwahler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice fix!

@spikecurtis
Improve logging & comments
33b0477 
Signed-off-by: spikecurtis <spike@spikecurtis.com>
@spikecurtis spikecurtis merged commit b1e4cfe into main Jul 1, 2022
@spikecurtis spikecurtis deleted the spike/provisioner_job_logs_stream branch July 1, 2022 21:07
kylecarbs
kylecarbs reviewed Jul 1, 2022
View reviewed changes
coderd/provisionerjobs.go

// provisionerJobLogsMessage is the message type published on the provisionerJobLogsChannel() channel
type provisionerJobLogsMessage struct {
EndOfLogs bool `json:"end_of_logs,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be End instead for naming redundancy. Final may be more apt, chefs choice.

ketang pushed a commit that referenced this pull request Jul 3, 2022
@spikecurtis @ketang
fix pubsub/poll race on provisioner job logs (#2783)
3306dca 
* fix pubsub/poll race on provisioner job logs

Signed-off-by: Spike Curtis <spike@coder.com>

* only cancel on non-error

Signed-off-by: Spike Curtis <spike@coder.com>

* Improve logging & comments

Signed-off-by: spikecurtis <spike@spikecurtis.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kylecarbs kylecarbs kylecarbs left review comments

@Emyrk Emyrk Emyrk approved these changes

+1 more reviewer

@dwahler dwahler dwahler approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

streaming job logs race condition means not all logs are returned / TestDelete flake
4 participants
@spikecurtis @dwahler @Emyrk @kylecarbs
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy