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

Make a copy of containerInfo in containerData#GetInfo
This commit is contained in:
David Ashpole 2020-04-14 11:24:01 -07:00 committed by GitHub
commit 713e6af0d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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) {