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: 52503: Get fallback termination msg from docker when using journald log driver #16912

Merged

Conversation

joelsmith
Copy link
Contributor

@joelsmith joelsmith commented Oct 17, 2017

xref kubernetes/kubernetes#52503

From the commit message:

When using the legacy docker container runtime and when a container has
terminationMessagePolicy=FallbackToLogsOnError and when docker is
configured with a log driver other than json-log (such as journald),
the kubelet should not try to get the container's log from the
json log file (since it's not there) but should instead ask docker for
the logs.

fixes #15878

…journald log driver

When using the legacy docker container runtime and when a container has
terminationMessagePolicy=FallbackToLogsOnError and when docker is
configured with a log driver other than json-log (such as journald),
the kubelet should not try to get the container's log from the
json log file (since it's not there) but should instead ask docker for
the logs.
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Oct 17, 2017
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 17, 2017
@joelsmith joelsmith added the kind/bug Categorizes issue or PR as related to a bug. label Oct 17, 2017
@sjenning
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2017
@derekwaynecarr
Copy link
Member

/kind bug
/approve
/lgtm

@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, joelsmith, sjenning

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2017
@joelsmith
Copy link
Contributor Author

/test extended_conformance_gce

@joelsmith
Copy link
Contributor Author

/test extended_conformance_install_update

@joelsmith
Copy link
Contributor Author

/test extended_conformance_gce

1 similar comment
@joelsmith
Copy link
Contributor Author

/test extended_conformance_gce

@joelsmith
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@joelsmith
Copy link
Contributor Author

/retest

@sjenning
Copy link
Contributor

flake #16870

/test extended_conformance_install_update

@joelsmith
Copy link
Contributor Author

/retest

2 similar comments
@joelsmith
Copy link
Contributor Author

/retest

@joelsmith
Copy link
Contributor Author

/retest

@joelsmith
Copy link
Contributor Author

/test unit

@joelsmith
Copy link
Contributor Author

/retest

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

logSnippet error reading termination message from logs
8 participants