Merge pull request #4656 from zhuangqh/fix-unknown-state

estesp · web-flow · commit 839b13699209 · 2020-10-27T08:54:30.000-04:00
CRI: always set unknown to false when handling exit event
diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go
@@ -325,14 +325,12 @@ func handleContainerExit(ctx context.Context, e *eventtypes.TaskExit, cntr conta
 		}
 	}
 	err = cntr.Status.UpdateSync(func(status containerstore.Status) (containerstore.Status, error) {
-		// If FinishedAt has been set (e.g. with start failure), keep as
-		// it is.
-		if status.FinishedAt != 0 {
-			return status, nil
+		if status.FinishedAt == 0 {
+			status.Pid = 0
+			status.FinishedAt = e.ExitedAt.UnixNano()
+			status.ExitCode = int32(e.ExitStatus)
 		}
-		status.Pid = 0
-		status.FinishedAt = e.ExitedAt.UnixNano()
-		status.ExitCode = int32(e.ExitStatus)
+
 		// Unknown state can only transit to EXITED state, so we need
 		// to handle unknown state here.
 		if status.Unknown {
