Rework shim logger shutdown process#4162
Merged
estesp merged 1 commit intocontainerd:masterfrom Apr 8, 2020
Merged
Conversation
aaithal
reviewed
Apr 7, 2020
mxpv
force-pushed
the
log-fix
branch
3 times, most recently
from
7c476d1 to
4cbb6b2
Compare
aaithal
approved these changes
Apr 7, 2020
Codecov Report
@@ Coverage Diff @@
## master #4162 +/- ##
==========================================
- Coverage 42.14% 38.33% -3.81%
==========================================
Files 133 90 -43
Lines 15209 12705 -2504
==========================================
- Hits 6410 4871 -1539
+ Misses 7870 7174 -696
+ Partials 929 660 -269
Continue to review full report at Codecov.
|
Signed-off-by: Maksym Pavlenko <[email protected]>
fuweid
reviewed
Apr 8, 2020
| return nil, err | ||
| } | ||
|
|
||
| serr, err := newPipe() |
Member
There was a problem hiding this comment.
we should close pipe if meet error. since it is not related to this issue, it can be follow-up pr.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
A few changes in shim logger process shutdown flow:
s.Scan()exit loops.io.containerd.timeout.shim.logger.shutdowntimeout key.Fixes: #4159
Signed-off-by: Maksym Pavlenko [email protected]