Merge pull request #419 from lifupan/kata_support

add a benchmark testcase for measuring the time of creating pod and a container

Author: k8s-ci-robot

pkg/benchmark/container.go

@@ -96,7 +96,7 @@ var _ = framework.KubeDescribe("Container", func() {
 		}, defaultOperationTimes)
 
 		Measure("benchmark about listing Container", func(b Benchmarker) {
-			containerList := make([]string, framework.TestContext.Number)
+			containerList := make([]string, 0, framework.TestContext.Number)
 			var err error
 
 			for i := 0; i < framework.TestContext.Number; i++ {

pkg/benchmark/pod.go

@@ -58,32 +58,32 @@ var _ = framework.KubeDescribe("PodSandbox", func() {
 			})
 
 			framework.ExpectNoError(err, "failed to create PodSandbox: %v", err)
-			Expect(operation.Seconds()).Should(BeNumerically("<", 2), "create PodSandbox shouldn't take too long.")
+			Expect(operation.Seconds()).Should(BeNumerically("<", 5), "create PodSandbox shouldn't take too long.")
 
 			operation = b.Time("PodSandbox status", func() {
 				_, err = c.PodSandboxStatus(podID)
 			})
 
 			framework.ExpectNoError(err, "failed to get PodSandbox status: %v", err)
-			Expect(operation.Seconds()).Should(BeNumerically("<", 2), "get PodSandbox status shouldn't take too long.")
+			Expect(operation.Seconds()).Should(BeNumerically("<", 5), "get PodSandbox status shouldn't take too long.")
 
 			operation = b.Time("stop PodSandbox", func() {
 				err = c.StopPodSandbox(podID)
 			})
 
 			framework.ExpectNoError(err, "failed to stop PodSandbox: %v", err)
-			Expect(operation.Seconds()).Should(BeNumerically("<", 2), "stop PodSandbox shouldn't take too long.")
+			Expect(operation.Seconds()).Should(BeNumerically("<", 5), "stop PodSandbox shouldn't take too long.")
 
 			operation = b.Time("remove PodSandbox", func() {
 				c.RemovePodSandbox(podID)
 			})
 
 			framework.ExpectNoError(err, "failed to remove PodSandbox: %v", err)
-			Expect(operation.Seconds()).Should(BeNumerically("<", 2), "remove PodSandbox shouldn't take too long.")
+			Expect(operation.Seconds()).Should(BeNumerically("<", 5), "remove PodSandbox shouldn't take too long.")
 		}, defaultOperationTimes)
 
 		Measure("benchmark about listing PodSandbox", func(b Benchmarker) {
-			podList := make([]string, framework.TestContext.Number)
+			podList := make([]string, 0, framework.TestContext.Number)
 			var err error
 
 			for i := 0; i < framework.TestContext.Number; i++ {
@@ -96,7 +96,7 @@ var _ = framework.KubeDescribe("PodSandbox", func() {
 			})
 
 			framework.ExpectNoError(err, "failed to list PodSandbox: %v", err)
-			Expect(operation.Seconds()).Should(BeNumerically("<", 2), "list PodSandbox shouldn't take too long.")
+			Expect(operation.Seconds()).Should(BeNumerically("<", 5), "list PodSandbox shouldn't take too long.")
 
 			for _, podID := range podList {
 				c.StopPodSandbox(podID)

pkg/benchmark/pod_container.go

@@ -0,0 +1,74 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package benchmark
+
+import (
+	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = framework.KubeDescribe("PodSandbox", func() {
+	f := framework.NewDefaultCRIFramework()
+
+	var rc internalapi.RuntimeService
+	var ic internalapi.ImageManagerService
+	var podID string
+
+	BeforeEach(func() {
+		rc = f.CRIClient.CRIRuntimeClient
+		ic = f.CRIClient.CRIImageClient
+	})
+
+	AfterEach(func() {
+		By("stop PodSandbox")
+		rc.StopPodSandbox(podID)
+		By("delete PodSandbox")
+		rc.RemovePodSandbox(podID)
+	})
+
+	Context("benchmark about start a container from scratch", func() {
+		Measure("benchmark about start a container from scratch", func(b Benchmarker) {
+			var err error
+
+			podSandboxName := "PodSandbox-for-creating-pod-and-container-performance-test-" + framework.NewUUID()
+			uid := framework.DefaultUIDPrefix + framework.NewUUID()
+			namespace := framework.DefaultNamespacePrefix + framework.NewUUID()
+
+			config := &runtimeapi.PodSandboxConfig{
+				Metadata: framework.BuildPodSandboxMetadata(podSandboxName, uid, namespace, framework.DefaultAttempt),
+				Linux:    &runtimeapi.LinuxPodSandboxConfig{},
+			}
+
+			operation := b.Time("create PodSandbox and container", func() {
+				By("run PodSandbox")
+				podID, err = rc.RunPodSandbox(config, framework.TestContext.RuntimeHandler)
+				framework.ExpectNoError(err, "failed to create PodSandbox: %v", err)
+				By("create container in PodSandbox")
+				containerID := framework.CreateDefaultContainer(rc, ic, podID, config, "Pod-Container-for-creating-benchmark-")
+				By("start container in PodSandbox")
+				err = rc.StartContainer(containerID)
+			})
+
+			framework.ExpectNoError(err, "failed to start Container: %v", err)
+			Expect(operation.Seconds()).Should(BeNumerically("<", 5), "create PodSandbox shouldn't take too long.")
+		}, defaultOperationTimes)
+	})
+})