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

estesp · web-flow · commit adc0b6a578ed · 2020-11-25T19:35:23.000-05:00
[release/1.4 backport]  fix: always set unknown to false when handling exit event
diff --git a/pkg/server/events.go b/pkg/server/events.go
@@ -325,14 +325,11 @@ 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 {

Original file line number	Diff line number	Diff line change
`@@ -325,14 +325,11 @@ func handleContainerExit(ctx context.Context, e *eventtypes.TaskExit, cntr conta`
`325`	`325`	`}`
`326`	`326`	`}`
`327`	`327`	`err = cntr.Status.UpdateSync(func(status containerstore.Status) (containerstore.Status, error) {`
`328`		`- // If FinishedAt has been set (e.g. with start failure), keep as`
`329`		`- // it is.`
`330`		`- if status.FinishedAt != 0 {`
`331`		`- return status, nil`
	`328`	`+ if status.FinishedAt == 0 {`
	`329`	`+ status.Pid = 0`
	`330`	`+ status.FinishedAt = e.ExitedAt.UnixNano()`
	`331`	`+ status.ExitCode = int32(e.ExitStatus)`
`332`	`332`	`}`
`333`		`- status.Pid = 0`
`334`		`- status.FinishedAt = e.ExitedAt.UnixNano()`
`335`		`- status.ExitCode = int32(e.ExitStatus)`
`336`	`333`	`// Unknown state can only transit to EXITED state, so we need`
`337`	`334`	`// to handle unknown state here.`
`338`	`335`	`if status.Unknown {`