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

container_stats_test.go: avoid checking snapshot size

Browse Source 
On Linux, the snapshot size differs depending on the backing filesystem.
See issue 7909.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2023-01-03 22:35:10 +09:00
parent b21d28b458
commit 76d68b080e
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
integration/container_stats_test.go
View File

@ -61,7 +61,7 @@ func TestContainerStats(t *testing.T) {
if err != nil { if err != nil {
return false, err return false, err
} }
if s.GetWritableLayer().GetUsedBytes().GetValue() != 0 { if s.GetWritableLayer().GetTimestamp() != 0 {
return true, nil return true, nil
} }
return false, nil return false, nil
@ -103,7 +103,7 @@ func TestContainerConsumedStats(t *testing.T) {
if err != nil { if err != nil {
return false, err return false, err
} }
if s.GetMemory().GetWorkingSetBytes().GetValue() > 0 { if s.GetWritableLayer().GetTimestamp() > 0 {
return true, nil return true, nil
} }
return false, nil return false, nil
@ -179,7 +179,7 @@ func TestContainerListStats(t *testing.T) {
return false, err return false, err
} }
for _, s := range stats { for _, s := range stats {
if s.GetWritableLayer().GetUsedBytes().GetValue() == 0 { if s.GetWritableLayer().GetTimestamp() == 0 {
return false, nil return false, nil
} }
} }
@ -238,7 +238,7 @@ func TestContainerListStatsWithIdFilter(t *testing.T) {
if len(stats) != 1 { if len(stats) != 1 {
return false, errors.New("unexpected stats length") return false, errors.New("unexpected stats length")
} }
if stats[0].GetWritableLayer().GetUsedBytes().GetValue() != 0 { if stats[0].GetWritableLayer().GetTimestamp() != 0 {
return true, nil return true, nil
} }
return false, nil return false, nil
@ -300,7 +300,7 @@ func TestContainerListStatsWithSandboxIdFilter(t *testing.T) {
for _, containerStats := range stats { for _, containerStats := range stats {
// Wait for stats on all containers, not just the first one in the list. // Wait for stats on all containers, not just the first one in the list.
if containerStats.GetWritableLayer().GetUsedBytes().GetValue() == 0 { if containerStats.GetWritableLayer().GetTimestamp() == 0 {
return false, nil return false, nil
} }
} }
@ -358,7 +358,7 @@ func TestContainerListStatsWithIdSandboxIdFilter(t *testing.T) {
if len(stats) != 1 { if len(stats) != 1 {
return false, errors.New("unexpected stats length") return false, errors.New("unexpected stats length")
} }
if stats[0].GetWritableLayer().GetUsedBytes().GetValue() != 0 { if stats[0].GetWritableLayer().GetTimestamp() != 0 {
return true, nil return true, nil
} }
return false, nil return false, nil
@ -380,7 +380,7 @@ func TestContainerListStatsWithIdSandboxIdFilter(t *testing.T) {
if len(stats) != 1 { if len(stats) != 1 {
return false, fmt.Errorf("expected only one stat, but got %v", stats) return false, fmt.Errorf("expected only one stat, but got %v", stats)
} }
if stats[0].GetWritableLayer().GetUsedBytes().GetValue() != 0 { if stats[0].GetWritableLayer().GetTimestamp() != 0 {
return true, nil return true, nil
} }
return false, nil return false, nil
@ -410,7 +410,12 @@ func testStats(t *testing.T,
require.NotEmpty(t, s.GetMemory().GetWorkingSetBytes().GetValue()) require.NotEmpty(t, s.GetMemory().GetWorkingSetBytes().GetValue())
require.NotEmpty(t, s.GetWritableLayer().GetTimestamp()) require.NotEmpty(t, s.GetWritableLayer().GetTimestamp())
require.NotEmpty(t, s.GetWritableLayer().GetFsId().GetMountpoint()) require.NotEmpty(t, s.GetWritableLayer().GetFsId().GetMountpoint())
require.NotEmpty(t, s.GetWritableLayer().GetUsedBytes().GetValue())
// UsedBytes of a fresh container can be zero on Linux, depending on the backing filesystem.
// https://github.com/containerd/containerd/issues/7909
if goruntime.GOOS == "windows" {
require.NotEmpty(t, s.GetWritableLayer().GetUsedBytes().GetValue())
}
// Windows does not collect inodes stats. // Windows does not collect inodes stats.
if goruntime.GOOS != "windows" { if goruntime.GOOS != "windows" {