github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add truncindex for filter in List and Stat

Browse Source 
fix #344
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
This commit is contained in:
yanxuean
2017-11-06 16:47:43 +08:00
parent 4a4a860dfa
commit 6234337459
4 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/server/container_stats_list.go
View File

@@ -119,6 +119,15 @@ func (c *criContainerdService) getContainerMetrics(
return &cs, nil
}
func (c *criContainerdService) normalizeContainerStatsFilter(filter *runtime.ContainerStatsFilter) {
if cntr, err := c.containerStore.Get(filter.GetId()); err == nil {
filter.Id = cntr.ID
}
if sb, err := c.sandboxStore.Get(filter.GetPodSandboxId()); err == nil {
filter.PodSandboxId = sb.ID
}
}
// buildTaskMetricsRequest constructs a tasks.MetricsRequest based on
// the information in the stats request and the containerStore
func (c *criContainerdService) buildTaskMetricsRequest(
@@ -128,6 +137,7 @@ func (c *criContainerdService) buildTaskMetricsRequest(
if r.GetFilter() == nil {
return req, nil, nil
}
c.normalizeContainerStatsFilter(r.GetFilter())
var containers []containerstore.Container
for _, cntr := range c.containerStore.List() {
if r.GetFilter().GetId() != "" && cntr.ID != r.GetFilter().GetId() {