Merge pull request #22200 from pwittrock/flaky

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-01 14:51:59 -08:00

View File

@@ -1893,6 +1893,8 @@ func (config *RCConfig) start() error {
if failedContainers > maxContainerFailures { if failedContainers > maxContainerFailures {
dumpNodeDebugInfo(config.Client, containerRestartNodes.List()) dumpNodeDebugInfo(config.Client, containerRestartNodes.List())
// Get the logs from the failed containers to help diagnose what caused them to fail
logFailedContainers(config.Namespace)
return fmt.Errorf("%d containers failed which is more than allowed %d", failedContainers, maxContainerFailures) return fmt.Errorf("%d containers failed which is more than allowed %d", failedContainers, maxContainerFailures)
} }
if len(pods) < len(oldPods) || len(pods) > config.Replicas { if len(pods) < len(oldPods) || len(pods) > config.Replicas {