Skip to content
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.

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

UPSTREAM: 44406: CRI: Stop following container log when container exited #14380

Merged

Conversation

ncdc
Copy link
Contributor

@ncdc ncdc commented May 26, 2017

This only applies when docker's log driver is json-file, which I believe is always the case with docker for mac.

@jwforres @gabemontero @spadgett @smarterclayton @derekwaynecarr @sjenning

@spadgett
Copy link
Member

Confirmed this fixes the symptoms I was seeing in #14374

@gabemontero
Copy link
Contributor

gabemontero commented May 26, 2017 via email

@gabemontero
Copy link
Contributor

hey @ncdc - the fix here to the uninitiated seems pretty generic ... curious as to why this would only apply to json-file log driver

is the container status maintained so differently when using json-file vs. journald that the fix is not needed ... or is this just a timing window that is more prevalent with json-file?

thanks

@ncdc
Copy link
Contributor Author

ncdc commented May 26, 2017

@gabemontero we don't use this code path for journald - see kubernetes/kubernetes#42195.

@gabemontero
Copy link
Contributor

ah - gotcha - thanks @ncdc

@smarterclayton
Copy link
Contributor

smarterclayton commented May 26, 2017 via email

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 7c8c209

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 7c8c209

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1810/) (Base Commit: f703da4)

@openshift-bot
Copy link
Contributor

openshift-bot commented May 28, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/831/) (Base Commit: 2b00e78) (Extended Tests: blocker) (Image: devenv-rhel7_6280)

@openshift-bot openshift-bot merged commit 63fe34a into openshift:master May 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants