github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Container exit message lost due to FallbackToLogsOnError is not compatible with ContainerCannotRun

Browse Source
This commit is contained in:
Yuqi Wang 2019-08-12 16:15:59 +08:00
parent 0610bf0c7e
commit f82be3d3d0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/kuberuntime/kuberuntime_container.go
View File

@ -402,7 +402,9 @@ func (m *kubeGenericRuntimeManager) getPodContainerStatuses(uid kubetypes.UID, n
if status.State == runtimeapi.ContainerState_CONTAINER_EXITED { if status.State == runtimeapi.ContainerState_CONTAINER_EXITED {
// Populate the termination message if needed. // Populate the termination message if needed.
annotatedInfo := getContainerInfoFromAnnotations(status.Annotations) annotatedInfo := getContainerInfoFromAnnotations(status.Annotations)
fallbackToLogs := annotatedInfo.TerminationMessagePolicy == v1.TerminationMessageFallbackToLogsOnError && cStatus.ExitCode != 0 // If a container cannot even be started, it certainly does not have logs, so no need to fallbackToLogs.
fallbackToLogs := annotatedInfo.TerminationMessagePolicy == v1.TerminationMessageFallbackToLogsOnError &&
cStatus.ExitCode != 0 && cStatus.Reason != "ContainerCannotRun"
tMessage, checkLogs := getTerminationMessage(status, annotatedInfo.TerminationMessagePath, fallbackToLogs) tMessage, checkLogs := getTerminationMessage(status, annotatedInfo.TerminationMessagePath, fallbackToLogs)
if checkLogs { if checkLogs {
// if dockerLegacyService is populated, we're supposed to use it to fetch logs // if dockerLegacyService is populated, we're supposed to use it to fetch logs
@ -415,9 +417,12 @@ func (m *kubeGenericRuntimeManager) getPodContainerStatuses(uid kubetypes.UID, n
tMessage = m.readLastStringFromContainerLogs(status.GetLogPath()) tMessage = m.readLastStringFromContainerLogs(status.GetLogPath())
} }
} }
// Use the termination message written by the application is not empty // Enrich the termination message written by the application is not empty
if len(tMessage) != 0 { if len(tMessage) != 0 {
cStatus.Message = tMessage if len(cStatus.Message) != 0 {
cStatus.Message += ": "
}
cStatus.Message += tMessage
} }
} }
statuses[i] = cStatus statuses[i] = cStatus