Add test coverage for container stats

Mirantis · Sep 12, 2018 · 22eedcb · 22eedcb
1 parent b27a9b5
commit 22eedcb
Show file tree

Hide file tree

Showing 8 changed files with 234 additions and 4 deletions.
diff --git a/pkg/image/fake/store.go b/pkg/image/fake/store.go
@@ -141,3 +141,8 @@ func (s *FakeStore) FilesystemStats() (*types.FilesystemStats, error) {
 		UsedInodes: fakeUsedInodes,
 	}, nil
 }
+
+// BytesUsedBy implements BytesUsedBy method from Store interface.
+func (s *FakeStore) BytesUsedBy(path string) (uint64, error) {
+	return fakeUsedBytes, nil
+}
diff --git a/pkg/image/image.go b/pkg/image/image.go
@@ -92,6 +92,9 @@ type Store interface {
 
 	// FilesystemStats returns disk space and inode usage info for this store.
 	FilesystemStats() (*types.FilesystemStats, error)
+
+	// BytesUsedBy returns disk usage of the file in this store.
+	BytesUsedBy(path string) (uint64, error)
 }
 
 // VirtualSizeFunc specifies a function that returns the virtual
@@ -603,3 +606,12 @@ func (s *FileStore) FilesystemStats() (*types.FilesystemStats, error) {
 		UsedInodes: occupiedInodes,
 	}, nil
 }
+
+// BytesUsedBy return disk usage of provided file as seen in store
+func (s *FileStore) BytesUsedBy(path string) (uint64, error) {
+	fstat, err := os.Stat(path)
+	if err != nil {
+		return 0, err
+	}
+	return uint64(fstat.Size()), nil
+}
diff --git a/pkg/libvirttools/root_volumesource_test.go b/pkg/libvirttools/root_volumesource_test.go
@@ -61,6 +61,11 @@ func (im *FakeImageManager) FilesystemStats() (*types.FilesystemStats, error) {
 	}, nil
 }
 
+func (im *FakeImageManager) BytesUsedBy(path string) (uint64, error) {
+	im.rec.Rec("BytesUsedBy", path)
+	return fakeImageVirtualSize, nil
+}
+
 func TestRootVolumeNaming(t *testing.T) {
 	v := rootVolume{
 		volumeBase{

diff --git a/pkg/libvirttools/virtualization.go b/pkg/libvirttools/virtualization.go
@@ -18,7 +18,6 @@ package libvirttools
 
 import (
 	"fmt"
-	"os"
 	"path/filepath"
 	"strings"
 	"time"
@@ -818,7 +817,7 @@ func (v *VirtualizationTool) VMStats(containerID string, name string) (*types.VM
 		return nil, err
 	}
 	vs := types.VMStats{
-		Timestamp:   time.Now().UnixNano(),
+		Timestamp:   v.clock.Now().UnixNano(),
 		ContainerID: containerID,
 		Name:        name,
 	}
@@ -853,11 +852,11 @@ func (v *VirtualizationTool) VMStats(containerID string, name string) (*types.VM
 		return nil, fmt.Errorf("cannot locate root disk in domain definition")
 	}
 
-	fstat, err := os.Stat(rootDiskLocation)
+	rootDiskSize, err := v.ImageManager().BytesUsedBy(rootDiskLocation)
 	if err != nil {
 		return nil, err
 	}
-	vs.FsBytes = uint64(fstat.Size())
+	vs.FsBytes = rootDiskSize
 
 	return &vs, nil
 }

diff --git a/pkg/libvirttools/volumes.go b/pkg/libvirttools/volumes.go
@@ -28,6 +28,7 @@ import (
 type ImageManager interface {
 	GetImagePathAndVirtualSize(ref string) (string, uint64, error)
 	FilesystemStats() (*types.FilesystemStats, error)
+	BytesUsedBy(path string) (uint64, error)
 }
 
 type volumeOwner interface {

diff --git a/pkg/manager/TestCRIPods.out.yaml b/pkg/manager/TestCRIPods.out.yaml
@@ -301,6 +301,56 @@
         name: container-for-testName_0
       started_at: 1524648266720331175
       state: 1
+- name: 'enter: ContainerStats'
+  value:
+    container_id: 231700d5-c9a6-5a49-738d-99a954c51550
+- name: 'leave: ContainerStats'
+  value:
+    stats:
+      attributes:
+        id: 231700d5-c9a6-5a49-738d-99a954c51550
+        metadata:
+          name: 231700d5-c9a6-5a49-738d-99a954c51550
+      cpu:
+        timestamp: 1524648266720331175
+        usage_core_nano_seconds: {}
+      memory:
+        timestamp: 1524648266720331175
+        working_set_bytes: {}
+      writable_layer:
+        fs_id:
+          mountpoint: /var/lib/virtlet
+        inodes_used:
+          value: 1
+        timestamp: 1524648266720331175
+        used_bytes:
+          value: 1073741824
+- name: 'enter: ListContainerStats'
+  value: {}
+- name: 'domain conn: ListDomains'
+  value:
+  - virtlet-231700d5-c9a6-container-for-testName_0
+- name: 'leave: ListContainerStats'
+  value:
+    stats:
+    - attributes:
+        id: 231700d5-c9a6-5a49-738d-99a954c51550
+        metadata:
+          name: 231700d5-c9a6-5a49-738d-99a954c51550
+      cpu:
+        timestamp: 1524648266720331175
+        usage_core_nano_seconds: {}
+      memory:
+        timestamp: 1524648266720331175
+        working_set_bytes: {}
+      writable_layer:
+        fs_id:
+          mountpoint: /var/lib/virtlet
+        inodes_used:
+          value: 1
+        timestamp: 1524648266720331175
+        used_bytes:
+          value: 1073741824
 - name: 'enter: PullImage'
   value:
     image:

diff --git a/pkg/manager/TestContainerListStats.out.yaml b/pkg/manager/TestContainerListStats.out.yaml
@@ -0,0 +1,117 @@
+- name: 'enter: ListContainerStats'
+  value: {}
+- name: 'leave: ListContainerStats'
+  value:
+    stats:
+    - attributes:
+        id: 231700d5-c9a6-5a49-738d-99a954c51550
+        metadata:
+          name: 231700d5-c9a6-5a49-738d-99a954c51550
+      cpu:
+        timestamp: 1524648266720331175
+        usage_core_nano_seconds: {}
+      memory:
+        timestamp: 1524648266720331175
+        working_set_bytes: {}
+      writable_layer:
+        fs_id:
+          mountpoint: /var/lib/virtlet
+        inodes_used:
+          value: 1
+        timestamp: 1524648266720331175
+        used_bytes:
+          value: 1073741824
+    - attributes:
+        id: 6b94d9a7-e22a-5d08-65ee-16b9b1e07ab0
+        metadata:
+          name: 6b94d9a7-e22a-5d08-65ee-16b9b1e07ab0
+      cpu:
+        timestamp: 1524648266720331175
+        usage_core_nano_seconds: {}
+      memory:
+        timestamp: 1524648266720331175
+        working_set_bytes: {}
+      writable_layer:
+        fs_id:
+          mountpoint: /var/lib/virtlet
+        inodes_used:
+          value: 1
+        timestamp: 1524648266720331175
+        used_bytes:
+          value: 1073741824
+- name: 'enter: ListContainerStats'
+  value:
+    filter:
+      id: 231700d5-c9a6-5a49-738d-99a954c51550
+- name: 'leave: ListContainerStats'
+  value:
+    stats:
+    - attributes:
+        id: 231700d5-c9a6-5a49-738d-99a954c51550
+        metadata:
+          name: 231700d5-c9a6-5a49-738d-99a954c51550
+      cpu:
+        timestamp: 1524648266720331175
+        usage_core_nano_seconds: {}
+      memory:
+        timestamp: 1524648266720331175
+        working_set_bytes: {}
+      writable_layer:
+        fs_id:
+          mountpoint: /var/lib/virtlet
+        inodes_used:
+          value: 1
+        timestamp: 1524648266720331175
+        used_bytes:
+          value: 1073741824
+- name: 'enter: ListContainerStats'
+  value:
+    filter:
+      label_selector:
+        io.kubernetes.pod.name: testName_1
+- name: 'leave: ListContainerStats'
+  value:
+    stats:
+    - attributes:
+        id: 6b94d9a7-e22a-5d08-65ee-16b9b1e07ab0
+        metadata:
+          name: 6b94d9a7-e22a-5d08-65ee-16b9b1e07ab0
+      cpu:
+        timestamp: 1524648266720331175
+        usage_core_nano_seconds: {}
+      memory:
+        timestamp: 1524648266720331175
+        working_set_bytes: {}
+      writable_layer:
+        fs_id:
+          mountpoint: /var/lib/virtlet
+        inodes_used:
+          value: 1
+        timestamp: 1524648266720331175
+        used_bytes:
+          value: 1073741824
+- name: 'enter: ListContainerStats'
+  value:
+    filter:
+      pod_sandbox_id: 69eec606-0493-5825-73a4-c5e0c0236155
+- name: 'leave: ListContainerStats'
+  value:
+    stats:
+    - attributes:
+        id: 231700d5-c9a6-5a49-738d-99a954c51550
+        metadata:
+          name: 231700d5-c9a6-5a49-738d-99a954c51550
+      cpu:
+        timestamp: 1524648266720331175
+        usage_core_nano_seconds: {}
+      memory:
+        timestamp: 1524648266720331175
+        working_set_bytes: {}
+      writable_layer:
+        fs_id:
+          mountpoint: /var/lib/virtlet
+        inodes_used:
+          value: 1
+        timestamp: 1524648266720331175
+        used_bytes:
+          value: 1073741824
diff --git a/pkg/manager/runtime_test.go b/pkg/manager/runtime_test.go
@@ -370,6 +370,10 @@ func (tst *virtletCRITester) listContainers(filter *kubeapi.ContainerFilter) {
 	tst.invoke("ListContainers", &kubeapi.ListContainersRequest{Filter: filter}, true)
 }
 
+func (tst *virtletCRITester) listContainerStats(filter *kubeapi.ContainerStatsFilter) {
+	tst.invoke("ListContainerStats", &kubeapi.ListContainerStatsRequest{Filter: filter}, true)
+}
+
 func (tst *virtletCRITester) createContainer(sandbox *kubeapi.PodSandboxConfig, container *criapi.ContainerTestConfig, imageSpec *kubeapi.ImageSpec, mounts []*kubeapi.Mount) string {
 	req := createContainerRequest(sandbox, container, imageSpec, mounts)
 	resp, err := tst.invoke("CreateContainer", req, true)
@@ -397,6 +401,10 @@ func (tst *virtletCRITester) stopContainer(containerID string) {
 	tst.invoke("StopContainer", &kubeapi.StopContainerRequest{ContainerId: containerID}, true)
 }
 
+func (tst *virtletCRITester) containerStats(containerID string) {
+	tst.invoke("ContainerStats", &kubeapi.ContainerStatsRequest{ContainerId: containerID}, true)
+}
+
 func (tst *virtletCRITester) removeContainer(containerID string) {
 	tst.invoke("RemoveContainer", &kubeapi.RemoveContainerRequest{ContainerId: containerID}, true)
 }
@@ -457,6 +465,8 @@ func TestCRIPods(t *testing.T) {
 	tst.containerStatus(containerId1)
 	tst.startContainer(containerId1)
 	tst.containerStatus(containerId1)
+	tst.containerStats(containerId1)
+	tst.listContainerStats(nil)
 
 	tst.pullImage(ubuntuImg())
 	tst.runPodSandbox(sandboxes[1])
@@ -626,6 +636,37 @@ func TestCRIContainerFilters(t *testing.T) {
 	tst.verify()
 }
 
+func TestContainerListStats(t *testing.T) {
+	tst := makeVirtletCRITester(t)
+	tst.rec.AddFilter("ListContainers")
+	tst.rec.AddFilter("ListContainerStats")
+	defer tst.teardown()
+
+	sandboxes := criapi.GetSandboxes(2)
+	containers := criapi.GetContainersConfig(sandboxes)
+	tst.pullImage(cirrosImg())
+	tst.runPodSandbox(sandboxes[0])
+	containerId1 := tst.createContainer(sandboxes[0], containers[0], cirrosImg(), nil)
+	tst.startContainer(containerId1)
+	tst.pullImage(ubuntuImg())
+	tst.runPodSandbox(sandboxes[1])
+	containerId2 := tst.createContainer(sandboxes[1], containers[1], ubuntuImg(), nil)
+	tst.startContainer(containerId2)
+
+	tst.listContainerStats(nil)
+	tst.listContainerStats(&kubeapi.ContainerStatsFilter{Id: containerId1})
+	tst.listContainerStats(&kubeapi.ContainerStatsFilter{
+		LabelSelector: map[string]string{
+			"io.kubernetes.pod.name": "testName_1",
+		},
+	})
+	tst.listContainerStats(&kubeapi.ContainerStatsFilter{
+		PodSandboxId: sandboxes[0].Metadata.Uid,
+	})
+
+	tst.verify()
+}
+
 func TestCRIAttachPortForward(t *testing.T) {
 	tst := makeVirtletCRITester(t)
 	tst.rec.AddFilter("Attach")