Send to copyDone when err == nil #767
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The ioproxy helps copy container logs from the normal container fifos to the firecracker uvm's vsock. The copying happens in a go-routine and when complete, it send a notification over the `copyDone` channel to signal to the agent/runtime to cleanup the ioproxy. This change fixes a bug where, if the iopoxy copy finished without an error (i.e. `io.CopyBuffer` got an `EOF` from the read end), the `copyDone` channel was not notified leaving the ioproxy connected to the vsock, but not the container. This change always notifies `copyDone` when the copy finishes. Signed-off-by: Kern Walster <[email protected]>
austinvazquez
approved these changes
Sep 21, 2023
swagatbora90
approved these changes
Sep 21, 2023
| } | ||
| copyDone <- err |
There was a problem hiding this comment.
qq: we close the copyDone channel regardless of whether the copy succeeds or fails. Shouldn't that indicate the runtime to clean up the ioproxy?
There was a problem hiding this comment.
Ah, yes. I missed that. Using the debug logs from #766 we actually don't see the "copied %d" message from
firecracker-containerd/internal/vm/ioproxy.go
Line 147 in fc5e81e
io.CopyBuffer?
There was a problem hiding this comment.
Do you see the copied message with your change to explicitly send an error?
this is where we wait for an error in the copy channel. I assumed this should return nil once we close the channel.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
The ioproxy helps copy container logs from the normal container fifos to the firecracker uvm's vsock. The copying happens in a go-routine and when complete, it send a notification over the
copyDonechannel to signal to the agent/runtime to cleanup the ioproxy.This change fixes a bug where, if the iopoxy copy finished without an error (i.e.
io.CopyBuffergot anEOFfrom the read end), thecopyDonechannel was not notified leaving the ioproxy connected to the vsock, but not the container. This change always notifiescopyDonewhen the copy finishes.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.