Avoid a data race in container/health.go

lzhfromustc · thaJeztah · commit 759272227c50 · 2020-01-17T10:12:32.000+01:00
Signed-off-by: Ziheng Liu &lt;lzhfromustc@gmail.com&gt;
(cherry picked from commit 53e0c5012637656de1765c330b2549aa7088b853)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: 32206f17d045d137e27bd1d15ed1cb4407abb9fc
Component: engine
diff --git a/components/engine/container/health.go b/components/engine/container/health.go
@@ -22,7 +22,7 @@ func (s *Health) String() string {
 	case types.Starting:
 		return "health: starting"
 	default: // Healthy and Unhealthy are clear on their own
-		return s.Health.Status
+		return status
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func (s *Health) String() string {`
`22`	`22`	`case types.Starting:`
`23`	`23`	`return "health: starting"`
`24`	`24`	`default: // Healthy and Unhealthy are clear on their own`
`25`		`- return s.Health.Status`
	`25`	`+ return status`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`