From fa455126fc9e0124fa4819168cf1fac09ac831ee Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Mon, 17 Oct 2016 16:43:13 -0700 Subject: [PATCH] Delete old summary test --- test/e2e_node/kubelet_test.go | 279 ---------------------------------- 1 file changed, 279 deletions(-) diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go index 1ce33a56c65..cc150e7aab2 100644 --- a/test/e2e_node/kubelet_test.go +++ b/test/e2e_node/kubelet_test.go @@ -18,21 +18,14 @@ package e2e_node import ( "bytes" - "encoding/json" "fmt" - "io/ioutil" - "net/http" - "strings" "time" "k8s.io/kubernetes/pkg/api" apiUnversioned "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" - "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" - "github.com/davecgh/go-spew/spew" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) @@ -158,276 +151,4 @@ var _ = framework.KubeDescribe("Kubelet", func() { }, time.Minute, time.Second*4).Should(Equal("sh: can't create /file: Read-only file system\n")) }) }) - Describe("metrics api", func() { - Context("when querying /stats/summary", func() { - It("it should report resource usage through the stats api", func() { - podNamePrefix := "stats-busybox-" + string(uuid.NewUUID()) - podNames := sets.NewString(podNamePrefix+"0", podNamePrefix+"1") - volumes := sets.NewString("test-empty-dir") - - createSummaryTestPods(f, podNames.List()...) - By("Returning stats summary") - summary := stats.Summary{} - Eventually(func() error { - resp, err := http.Get(*kubeletAddress + "/stats/summary") - if err != nil { - return fmt.Errorf("Failed to get /stats/summary - %v", err) - } - contentsBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - return fmt.Errorf("Failed to read /stats/summary - %+v", resp) - } - contents := string(contentsBytes) - decoder := json.NewDecoder(strings.NewReader(contents)) - err = decoder.Decode(&summary) - if err != nil { - return fmt.Errorf("Failed to parse /stats/summary to go struct: %+v", resp) - } - missingPods := podsMissingFromSummary(summary, podNames) - if missingPods.Len() != 0 { - return fmt.Errorf("expected pods not found. Following pods are missing - %v", missingPods) - } - missingVolumes := volumesMissingFromSummary(summary, volumes) - if missingVolumes.Len() != 0 { - return fmt.Errorf("expected volumes not found. Following volumes are missing - %v", missingVolumes) - } - if err := testSummaryMetrics(summary, podNamePrefix); err != nil { - return err - } - return nil - }, 5*time.Minute, time.Second*4).Should(BeNil()) - }) - }) - }) }) - -// Returns pods missing from summary. -func podsMissingFromSummary(s stats.Summary, expectedPods sets.String) sets.String { - expectedPods = sets.StringKeySet(expectedPods) - for _, pod := range s.Pods { - if expectedPods.Has(pod.PodRef.Name) { - expectedPods.Delete(pod.PodRef.Name) - } - } - return expectedPods -} - -// Returns volumes missing from summary. -func volumesMissingFromSummary(s stats.Summary, expectedVolumes sets.String) sets.String { - for _, pod := range s.Pods { - expectedPodVolumes := sets.StringKeySet(expectedVolumes) - for _, vs := range pod.VolumeStats { - if expectedPodVolumes.Has(vs.Name) { - expectedPodVolumes.Delete(vs.Name) - } - } - if expectedPodVolumes.Len() != 0 { - return expectedPodVolumes - } - } - return sets.NewString() -} - -func testSummaryMetrics(s stats.Summary, podNamePrefix string) error { - const ( - nonNilValue = "expected %q to not be nil" - nonZeroValue = "expected %q to not be zero" - ) - if s.Node.NodeName != framework.TestContext.NodeName { - return fmt.Errorf("unexpected node name - %q", s.Node.NodeName) - } - if s.Node.CPU.UsageCoreNanoSeconds == nil { - return fmt.Errorf(nonNilValue, "cpu instantaneous") - } - if *s.Node.CPU.UsageCoreNanoSeconds == 0 { - return fmt.Errorf(nonZeroValue, "cpu instantaneous") - } - if s.Node.Memory.UsageBytes == nil { - return fmt.Errorf(nonNilValue, "memory") - } - if *s.Node.Memory.UsageBytes == 0 { - return fmt.Errorf(nonZeroValue, "memory") - } - if s.Node.Memory.WorkingSetBytes == nil { - return fmt.Errorf(nonNilValue, "memory working set") - } - if *s.Node.Memory.WorkingSetBytes == 0 { - return fmt.Errorf(nonZeroValue, "memory working set") - } - if s.Node.Fs.AvailableBytes == nil { - return fmt.Errorf(nonNilValue, "memory working set") - } - if *s.Node.Fs.AvailableBytes == 0 { - return fmt.Errorf(nonZeroValue, "node Fs available") - } - if s.Node.Fs.CapacityBytes == nil { - return fmt.Errorf(nonNilValue, "node fs capacity") - } - if *s.Node.Fs.CapacityBytes == 0 { - return fmt.Errorf(nonZeroValue, "node fs capacity") - } - if s.Node.Fs.UsedBytes == nil { - return fmt.Errorf(nonNilValue, "node fs used") - } - if *s.Node.Fs.UsedBytes == 0 { - return fmt.Errorf(nonZeroValue, "node fs used") - } - - if s.Node.Runtime == nil { - return fmt.Errorf(nonNilValue, "node runtime") - } - if s.Node.Runtime.ImageFs == nil { - return fmt.Errorf(nonNilValue, "runtime image Fs") - } - if s.Node.Runtime.ImageFs.AvailableBytes == nil { - return fmt.Errorf(nonNilValue, "runtime image Fs available") - } - if *s.Node.Runtime.ImageFs.AvailableBytes == 0 { - return fmt.Errorf(nonZeroValue, "runtime image Fs available") - } - if s.Node.Runtime.ImageFs.CapacityBytes == nil { - return fmt.Errorf(nonNilValue, "runtime image Fs capacity") - } - if *s.Node.Runtime.ImageFs.CapacityBytes == 0 { - return fmt.Errorf(nonZeroValue, "runtime image Fs capacity") - } - if s.Node.Runtime.ImageFs.UsedBytes == nil { - return fmt.Errorf(nonNilValue, "runtime image Fs usage") - } - if *s.Node.Runtime.ImageFs.UsedBytes == 0 { - return fmt.Errorf(nonZeroValue, "runtime image Fs usage") - } - sysContainers := map[string]stats.ContainerStats{} - for _, container := range s.Node.SystemContainers { - sysContainers[container.Name] = container - if err := expectContainerStatsNotEmpty(&container); err != nil { - return err - } - } - if _, exists := sysContainers["kubelet"]; !exists { - return fmt.Errorf("expected metrics for kubelet") - } - if _, exists := sysContainers["runtime"]; !exists { - return fmt.Errorf("expected metrics for runtime") - } - // Verify Pods Stats are present - podsList := []string{} - By("Having resources for pods") - for _, pod := range s.Pods { - if !strings.HasPrefix(pod.PodRef.Name, podNamePrefix) { - // Ignore pods created outside this test - continue - } - - podsList = append(podsList, pod.PodRef.Name) - - if len(pod.Containers) != 1 { - return fmt.Errorf("expected only one container") - } - container := pod.Containers[0] - - if container.Name != "busybox-container" { - return fmt.Errorf("unexpected container name - %q", container.Name) - } - - if err := expectContainerStatsNotEmpty(&container); err != nil { - return err - } - - // emptydir volume - foundExpectedVolume := false - for _, vs := range pod.VolumeStats { - if *vs.CapacityBytes == 0 { - return fmt.Errorf(nonZeroValue, "volume capacity") - } - if *vs.AvailableBytes == 0 { - return fmt.Errorf(nonZeroValue, "volume available") - } - if *vs.UsedBytes == 0 { - return fmt.Errorf(nonZeroValue, "volume used") - } - if vs.Name == "test-empty-dir" { - foundExpectedVolume = true - } - } - if !foundExpectedVolume { - return fmt.Errorf("expected 'test-empty-dir' volume") - } - - // fs usage (not for system containers) - if container.Rootfs == nil { - return fmt.Errorf(nonNilValue+" - "+spew.Sdump(container), "container root fs") - } - if container.Rootfs.AvailableBytes == nil { - return fmt.Errorf(nonNilValue+" - "+spew.Sdump(container), "container root fs available") - } - if *container.Rootfs.AvailableBytes == 0 { - return fmt.Errorf(nonZeroValue+" - "+spew.Sdump(container), "container root fs available") - } - if container.Rootfs.CapacityBytes == nil { - return fmt.Errorf(nonNilValue+" - "+spew.Sdump(container), "container root fs capacity") - } - if *container.Rootfs.CapacityBytes == 0 { - return fmt.Errorf(nonZeroValue+" - "+spew.Sdump(container), "container root fs capacity") - } - if container.Rootfs.UsedBytes == nil { - return fmt.Errorf(nonNilValue+" - "+spew.Sdump(container), "container root fs usage") - } - if *container.Rootfs.UsedBytes == 0 { - return fmt.Errorf(nonZeroValue+" - "+spew.Sdump(container), "container root fs usage") - } - if container.Logs == nil { - return fmt.Errorf(nonNilValue+" - "+spew.Sdump(container), "container logs") - } - if container.Logs.AvailableBytes == nil { - return fmt.Errorf(nonNilValue+" - "+spew.Sdump(container), "container logs available") - } - if *container.Logs.AvailableBytes == 0 { - return fmt.Errorf(nonZeroValue+" - "+spew.Sdump(container), "container logs available") - } - if container.Logs.CapacityBytes == nil { - return fmt.Errorf(nonNilValue+" - "+spew.Sdump(container), "container logs capacity") - } - if *container.Logs.CapacityBytes == 0 { - return fmt.Errorf(nonZeroValue+" - "+spew.Sdump(container), "container logs capacity") - } - if container.Logs.UsedBytes == nil { - return fmt.Errorf(nonNilValue+" - "+spew.Sdump(container), "container logs usage") - } - if *container.Logs.UsedBytes == 0 { - return fmt.Errorf(nonZeroValue+" - "+spew.Sdump(container), "container logs usage") - } - } - return nil -} - -func expectContainerStatsNotEmpty(container *stats.ContainerStats) error { - // TODO: Test Network - - if container.CPU == nil { - return fmt.Errorf("expected container cpu to be not nil - %q", spew.Sdump(container)) - } - if container.CPU.UsageCoreNanoSeconds == nil { - return fmt.Errorf("expected container cpu instantaneous usage to be not nil - %q", spew.Sdump(container)) - } - if *container.CPU.UsageCoreNanoSeconds == 0 { - return fmt.Errorf("expected container cpu instantaneous usage to be non zero - %q", spew.Sdump(container)) - } - - if container.Memory == nil { - return fmt.Errorf("expected container memory to be not nil - %q", spew.Sdump(container)) - } - if container.Memory.UsageBytes == nil { - return fmt.Errorf("expected container memory usage to be not nil - %q", spew.Sdump(container)) - } - if *container.Memory.UsageBytes == 0 { - return fmt.Errorf("expected container memory usage to be non zero - %q", spew.Sdump(container)) - } - if container.Memory.WorkingSetBytes == nil { - return fmt.Errorf("expected container memory working set to be not nil - %q", spew.Sdump(container)) - } - if *container.Memory.WorkingSetBytes == 0 { - return fmt.Errorf("expected container memory working set to be non zero - %q", spew.Sdump(container)) - } - return nil -}