1. docker
  2. Commit 55fcd6f4db6088be90eef1e521e5e2e89d0b71a1
Browse code

Merge pull request #31192 from thaJeztah/warn-instead-of-error

don't log v2 pull as error when retrying

Aaron Lehmann authored on 2017/02/25 02:58:13
Showing 3 changed files
distribution/pull.go
History View file @ 55fcd6f
... ... 
@@ -140,7 +140,7 @@ func Pull(ctx context.Context, ref reference.Named, imagePullConfig *ImagePullCo
140 140 
 					// append subsequent errors
141 141 
 					lastErr = err
142 142 
 				}
143 
-				logrus.Errorf("Attempting next endpoint for pull after error: %v", err)
143 
+				logrus.Infof("Attempting next endpoint for pull after error: %v", err)
144 144 
 				continue
145 145 
 			}
146 146 
 			logrus.Errorf("Not continuing with pull after error: %v", err)
distribution/pull_v2.go
History View file @ 55fcd6f
... ... 
@@ -73,7 +73,6 @@ func (p *v2Puller) Pull(ctx context.Context, ref reference.Named) (err error) {
73 73 
 			return err
74 74 
 		}
75 75 
 		if continueOnError(err) {
76 
-			logrus.Errorf("Error trying v2 registry: %v", err)
77 76 
 			return fallbackError{
78 77 
 				err:         err,
79 78 
 				confirmedV2: p.confirmedV2,
distribution/push.go
History View file @ 55fcd6f
... ... 
@@ -126,7 +126,7 @@ func Push(ctx context.Context, ref reference.Named, imagePushConfig *ImagePushCo
126 126 
 					}
127 127 
 					err = fallbackErr.err
128 128 
 					lastErr = err
129 
-					logrus.Errorf("Attempting next endpoint for push after error: %v", err)
129 
+					logrus.Infof("Attempting next endpoint for push after error: %v", err)
130 130 
 					continue
131 131 
 				}
132 132 
 			}