Do not abort image-pull in Extracting phase

Signed-off-by: Xinfeng Liu <[email protected]>

libdocker/kube_docker_client.go

@@ -314,21 +314,21 @@ func (p *progress) set(msg *dockermessage.JSONMessage) {
 	p.timestamp = time.Now()
 }
 
-func (p *progress) get() (string, time.Time) {
+func (p *progress) get() (status, msg string, timestamp time.Time) {
 	p.RLock()
 	defer p.RUnlock()
 	if p.message == nil {
-		return "No progress", p.timestamp
+		return "", "No progress", p.timestamp
 	}
 	// The following code is based on JSONMessage.Display
 	var prefix string
 	if p.message.ID != "" {
 		prefix = fmt.Sprintf("%s: ", p.message.ID)
 	}
 	if p.message.Progress == nil {
-		return fmt.Sprintf("%s%s", prefix, p.message.Status), p.timestamp
+		return p.message.Status, fmt.Sprintf("%s%s", prefix, p.message.Status), p.timestamp
 	}
-	return fmt.Sprintf(
+	return p.message.Status, fmt.Sprintf(
 		"%s%s %s",
 		prefix,
 		p.message.Status,
@@ -368,9 +368,9 @@ func (p *progressReporter) start() {
 		for {
 			select {
 			case <-ticker.C:
-				progress, timestamp := p.progress.get()
-				// If there is no progress for p.imagePullProgressDeadline, cancel the operation.
-				if time.Since(timestamp) > p.imagePullProgressDeadline {
+				status, progress, timestamp := p.progress.get()
+				// If there is no progress for p.imagePullProgressDeadline in 'Downloading' phase, cancel the operation.
+				if status != "Extracting" && time.Since(timestamp) > p.imagePullProgressDeadline {
 					logrus.Errorf(
 						"Cancel pulling image %s because it exceeded image pull deadline %s. Latest progress %s",
 						p.image,
@@ -382,7 +382,7 @@ func (p *progressReporter) start() {
 				}
 				logrus.Infof("Pulling image %s: %s", p.image, progress)
 			case <-p.stopCh:
-				progress, _ := p.progress.get()
+				_, progress, _ := p.progress.get()
 				logrus.Infof("Stop pulling image %s: %s", p.image, progress)
 				return
 			}