logReadCloser: ensure EOF after Close()
#3034
Merged
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
rade
reviewed
Jan 19, 2018
probe/kubernetes/logreadcloser.go
Outdated
| @@ -99,7 +99,8 @@ func (l *logReadCloser) Read(p []byte) (int, error) { | |||
| } | |||
|
|
|||
| func (l *logReadCloser) Close() error { | |||
| for _, rc := range l.readClosers { | |||
| for i, rc := range l.readClosers { | |||
| l.eof[i] = true | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
There's another issue: when |
rbruggem
force-pushed
the
very-high-cpu-on-get-logs
branch
2 times, most recently
from
cbc533f to
8b363b8
Compare
added 2 commits
January 19, 2018 14:13
This change makes the underlying reader set their corresponding `eof` slot to true on termination. This make the overall logReadCloser converge to EOF in case of errors of the underlying readers, therefore prevent spinning on read. `bufio.Reader.ReadBytes` may not return io.EOF when `Close()` closes the underlying reader. For instance, closing logReadCloser from the Scope App makes `bufio.Reader.ReadBytes` produce the following error: `http2: response body closed`.
Adding the !EOF check to the loop condition ensures not reading from closed channels.
rndstr
approved these changes
Jan 19, 2018
rbruggem
force-pushed
the
very-high-cpu-on-get-logs
branch
from
8b363b8 to
9198f6b
Compare
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.
logReadCloser would spin on Read after Close because EOF was not returned.
This change ensures EOF is returned once Close() is called.
Fixes #3033.