Merge pull request #2492 from tedyu/container-info-copy

dashpole · web-flow · commit 713e6af0d192 · 2020-04-14T11:24:01.000-07:00
Make a copy of containerInfo in containerData#GetInfo
diff --git a/manager/container.go b/manager/container.go
@@ -172,10 +172,17 @@ func (c *containerData) GetInfo(shouldUpdateSubcontainers bool) (*containerInfo,
 		}
 		c.infoLastUpdatedTime = c.clock.Now()
 	}
-	// Make a copy of the info for the user.
 	c.lock.Lock()
 	defer c.lock.Unlock()
-	return &c.info, nil
+	cInfo := containerInfo{
+		Subcontainers: c.info.Subcontainers,
+		Spec:          c.info.Spec,
+	}
+	cInfo.Id = c.info.Id
+	cInfo.Name = c.info.Name
+	cInfo.Aliases = c.info.Aliases
+	cInfo.Namespace = c.info.Namespace
+	return &cInfo, nil
 }
 
 func (c *containerData) DerivedStats() (v2.DerivedStats, error) {

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,17 @@ func (c containerData) GetInfo(shouldUpdateSubcontainers bool) (containerInfo,`
`172`	`172`	`}`
`173`	`173`	`c.infoLastUpdatedTime = c.clock.Now()`
`174`	`174`	`}`
`175`		`- // Make a copy of the info for the user.`
`176`	`175`	`c.lock.Lock()`
`177`	`176`	`defer c.lock.Unlock()`
`178`		`- return &c.info, nil`
	`177`	`+ cInfo := containerInfo{`
	`178`	`+ Subcontainers: c.info.Subcontainers,`
	`179`	`+ Spec: c.info.Spec,`
	`180`	`+ }`
	`181`	`+ cInfo.Id = c.info.Id`
	`182`	`+ cInfo.Name = c.info.Name`
	`183`	`+ cInfo.Aliases = c.info.Aliases`
	`184`	`+ cInfo.Namespace = c.info.Namespace`
	`185`	`+ return &cInfo, nil`
`179`	`186`	`}`
`180`	`187`
`181`	`188`	`func (c *containerData) DerivedStats() (v2.DerivedStats, error) {`