Merge pull request #1056 from HusterWan/zr/sync-stopped-container-status

bugfix: sync abnormal container status when start pouchd
AliyunContainerService · Apr 16, 2018 · 1f2b6ee · 1f2b6ee
2 parents 65b9dc2 + e1cd2da
commit 1f2b6ee
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go
@@ -174,15 +174,19 @@ func (mgr *ContainerManager) Restore(ctx context.Context) error {
 			logrus.Errorf("failed to recover container: %s,  %v", containerMeta.ID, err)
 		}
 
-		if err := mgr.Client.RecoverContainer(ctx, containerMeta.ID, io); err == nil {
-			return nil
+		err = mgr.Client.RecoverContainer(ctx, containerMeta.ID, io)
+		if err != nil && strings.Contains(err.Error(), "not found") {
+			logrus.Infof("container %s not found, executes mark stopped and release resources", containerMeta.ID)
+			if err := mgr.markStoppedAndRelease(&Container{meta: containerMeta}, nil); err != nil {
+				logrus.Errorf("failed to mark container: %s stop status, err: %v", containerMeta.ID, err)
+			}
+		} else if err != nil {
+			logrus.Errorf("failed to recover container: %s,  %v", containerMeta.ID, err)
+			// release io
+			io.Close()
+			mgr.IOs.Remove(containerMeta.ID)
 		}
 
-		logrus.Errorf("failed to recover container: %s,  %v", containerMeta.ID, err)
-		// release io
-		io.Close()
-		mgr.IOs.Remove(containerMeta.ID)
-
 		return nil
 	}
 	return mgr.Store.ForEach(fn)