Skip to content

fix: Check if start is nil before consuming in echo provisioner #2686

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 1 commit into from
Jun 27, 2022
Merged

fix: Check if start is nil before consuming in echo provisioner #2686

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix: Check if start is nil before consuming in echo provisioner 
This caused a race seen here:
https://github.com/coder/coder/runs/7074123929?check_suite_focus=true#step:10:217
  • Loading branch information
@kylecarbs
kylecarbs committed Jun 27, 2022
commit 26aefb56583b2fb28512ec5153918f4a07c3005a
4 changes: 4 additions & 0 deletions provisioner/echo/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ func (e *echo) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
return err
}
request := msg.GetStart()
if request == nil {
// A cancel could occur here!
return nil
Copy link
Member

@mafredri mafredri Jun 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Is the cancellation inferable via context, and if so, should we consider doing something like this here?

select {
case <-stream.Context().Done():
	return stream.Context().Err()
default:
	return errors.New("")
}

Copy link
Member Author

Choose a reason for hiding this comment

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

Nah, the cancelation isn't sent over the context at all. This should actually be fine because messages are handled synchronously, this one was just out of order!

}
for index := 0; ; index++ {
extension := ".protobuf"
if request.DryRun {
Expand Down