bugfix: attach hanging of cri container #2130
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
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
YaoZengzeng
force-pushed
the
fix-attach
branch
from
f5d89f5 to
c0a3ae2
Compare
Codecov Report
@@ Coverage Diff @@
## master #2130 +/- ##
==========================================
- Coverage 64.88% 64.84% -0.05%
==========================================
Files 208 208
Lines 16458 16465 +7
==========================================
- Hits 10679 10676 -3
- Misses 4451 4459 +8
- Partials 1328 1330 +2
|
allencloud
reviewed
Aug 21, 2018
| Stdin: openStdin, | ||
| Stdout: true, | ||
| Stderr: true, | ||
| CriLogFile: f, |
There was a problem hiding this comment.
Just double check this fd will be closed when finished, right? @YaoZengzeng
There was a problem hiding this comment.
It will be closed when IO is finished.
There was a problem hiding this comment.
could we disable json-file here? I mean that we can disable json-file in other PR.
fuweid
reviewed
Aug 22, 2018
| Stdin: openStdin, | ||
| Stdout: true, | ||
| Stderr: true, | ||
| CriLogFile: f, |
There was a problem hiding this comment.
could we disable json-file here? I mean that we can disable json-file in other PR.
| } | ||
| err = c.ContainerMgr.Attach(context.Background(), containerID, attachConfig) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to attach to container %q to get its log: %v", containerID, err) |
There was a problem hiding this comment.
Yes, we could change all this stuff of CRI in another PR.
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.
Signed-off-by: YaoZengzeng yaozengzeng@zju.edu.cn
Ⅰ. Describe what this PR did
If we want to get the log of cri container, the step as follows:
create container
attach to the io of the container
start the container
Then the IO of the container will be created in step 2
So we should decide whether open the Stdin of Container IO, otherwise it will never be opened
which will result the hanging of attach
Ⅱ. Does this pull request fix one issue?
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews