rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-23 12:28:15 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1919 from superseb/pass_docker_err

Browse Source 
Do not wipe the actual Docker error to show in log
This commit is contained in:
Sebastiaan van Steenis
2020-02-27 12:46:16 +01:00
committed by GitHub
parent 1440d35590 92a73e0bca
commit 6e3d1f0a15
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docker/docker.go
View File

@@ -359,7 +359,7 @@ func StopContainer(ctx context.Context, dClient *client.Client, hostname string,
// Retry up to RetryCount times to see if image exists // Retry up to RetryCount times to see if image exists
for i := 1; i <= RetryCount; i++ { for i := 1; i <= RetryCount; i++ {
logrus.Infof("Stopping container [%s] on host [%s] with stopTimeoutDuration [%s], try #%d", containerName, hostname, stopTimeoutDuration, i) logrus.Infof("Stopping container [%s] on host [%s] with stopTimeoutDuration [%s], try #%d", containerName, hostname, stopTimeoutDuration, i)
err := dClient.ContainerStop(ctx, containerName, &stopTimeoutDuration) err = dClient.ContainerStop(ctx, containerName, &stopTimeoutDuration)
if err != nil { if err != nil {
logrus.Warningf("Can't stop Docker container [%s] for host [%s]: %v", containerName, hostname, err) logrus.Warningf("Can't stop Docker container [%s] for host [%s]: %v", containerName, hostname, err)
continue continue
@@ -412,10 +412,11 @@ func CreateContainer(ctx context.Context, dClient *client.Client, hostname strin
if dClient == nil { if dClient == nil {
return container.ContainerCreateCreatedBody{}, fmt.Errorf("Failed to create container: docker client is nil for container [%s] on host [%s]", containerName, hostname) return container.ContainerCreateCreatedBody{}, fmt.Errorf("Failed to create container: docker client is nil for container [%s] on host [%s]", containerName, hostname)
} }
var created container.ContainerCreateCreatedBody
var err error var err error
// Retry up to RetryCount times to see if image exists // Retry up to RetryCount times to see if image exists
for i := 1; i <= RetryCount; i++ { for i := 1; i <= RetryCount; i++ {
created, err := dClient.ContainerCreate(ctx, imageCfg, hostCfg, nil, containerName) created, err = dClient.ContainerCreate(ctx, imageCfg, hostCfg, nil, containerName)
if err != nil { if err != nil {
logrus.Warningf("Failed to create Docker container [%s] on host [%s]: %v", containerName, hostname, err) logrus.Warningf("Failed to create Docker container [%s] on host [%s]: %v", containerName, hostname, err)
continue continue
@@ -429,10 +430,11 @@ func InspectContainer(ctx context.Context, dClient *client.Client, hostname stri
if dClient == nil { if dClient == nil {
return types.ContainerJSON{}, fmt.Errorf("Failed to inspect container: docker client is nil for container [%s] on host [%s]", containerName, hostname) return types.ContainerJSON{}, fmt.Errorf("Failed to inspect container: docker client is nil for container [%s] on host [%s]", containerName, hostname)
} }
var inspection types.ContainerJSON
var err error var err error
// Retry up to RetryCount times to see if image exists // Retry up to RetryCount times to see if image exists
for i := 1; i <= RetryCount; i++ { for i := 1; i <= RetryCount; i++ {
inspection, err := dClient.ContainerInspect(ctx, containerName) inspection, err = dClient.ContainerInspect(ctx, containerName)
if err != nil { if err != nil {
if client.IsErrNotFound(err) { if client.IsErrNotFound(err) {
return types.ContainerJSON{}, err return types.ContainerJSON{}, err
@@ -591,9 +593,10 @@ func ReadContainerLogs(ctx context.Context, dClient *client.Client, containerNam
if dClient == nil { if dClient == nil {
return nil, fmt.Errorf("Failed reading container logs: docker client is nil for container [%s]", containerName) return nil, fmt.Errorf("Failed reading container logs: docker client is nil for container [%s]", containerName)
} }
var logs io.ReadCloser
var err error var err error
for i := 1; i <= RetryCount; i++ { for i := 1; i <= RetryCount; i++ {
logs, err := dClient.ContainerLogs(ctx, containerName, types.ContainerLogsOptions{Follow: follow, ShowStdout: true, ShowStderr: true, Timestamps: false, Tail: tail}) logs, err = dClient.ContainerLogs(ctx, containerName, types.ContainerLogsOptions{Follow: follow, ShowStdout: true, ShowStderr: true, Timestamps: false, Tail: tail})
if err != nil { if err != nil {
logrus.Warnf("Can't read container logs for container [%s]: %v", containerName, err) logrus.Warnf("Can't read container logs for container [%s]: %v", containerName, err)
continue continue