Merge pull request kubernetes#24622 from derekwaynecarr/pod_qos_util

Automatic merge from submit-queue Add utility for determining qos of a pod @vishh - per slack chat.
chengyli · Apr 28, 2016 · 7a72541 · 7a72541
2 parents 8179a0d + 2b9cfd4
commit 7a72541
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 0 deletions.
diff --git a/pkg/kubelet/qos/util/qos.go b/pkg/kubelet/qos/util/qos.go
@@ -18,6 +18,7 @@ package util
 
 import (
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/util/sets"
 )
 
 const (
@@ -46,6 +47,25 @@ func isResourceBestEffort(container *api.Container, resource api.ResourceName) b
 	return !hasReq || req.Value() == 0
 }
 
+// GetPodQos returns the QoS class of a pod.
+// The QoS class of a pod is the lowest QoS class for each resource in each container.
+func GetPodQos(pod *api.Pod) string {
+	qosValues := sets.NewString()
+	for _, container := range pod.Spec.Containers {
+		qosPerResource := GetQoS(&container)
+		for _, qosValue := range qosPerResource {
+			qosValues.Insert(qosValue)
+		}
+	}
+	if qosValues.Has(BestEffort) {
+		return BestEffort
+	}
+	if qosValues.Has(Burstable) {
+		return Burstable
+	}
+	return Guaranteed
+}
+
 // GetQos returns a mapping of resource name to QoS class of a container
 func GetQoS(container *api.Container) map[api.ResourceName]string {
 	resourceToQoS := map[api.ResourceName]string{}

diff --git a/pkg/kubelet/qos/util/qos_test.go b/pkg/kubelet/qos/util/qos_test.go
@@ -0,0 +1,104 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+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 util
+
+import (
+	"testing"
+
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/resource"
+)
+
+func getResourceList(cpu, memory string) api.ResourceList {
+	res := api.ResourceList{}
+	if cpu != "" {
+		res[api.ResourceCPU] = resource.MustParse(cpu)
+	}
+	if memory != "" {
+		res[api.ResourceMemory] = resource.MustParse(memory)
+	}
+	return res
+}
+
+func getResourceRequirements(requests, limits api.ResourceList) api.ResourceRequirements {
+	res := api.ResourceRequirements{}
+	res.Requests = requests
+	res.Limits = limits
+	return res
+}
+
+func newContainer(name string, requests api.ResourceList, limits api.ResourceList) api.Container {
+	return api.Container{
+		Name:      name,
+		Resources: getResourceRequirements(requests, limits),
+	}
+}
+
+func newPod(name string, containers []api.Container) *api.Pod {
+	return &api.Pod{
+		ObjectMeta: api.ObjectMeta{
+			Name: name,
+		},
+		Spec: api.PodSpec{
+			Containers: containers,
+		},
+	}
+}
+
+func TestGetPodQos(t *testing.T) {
+	testCases := []struct {
+		pod      *api.Pod
+		expected string
+	}{
+		{
+			pod: newPod("best-effort", []api.Container{
+				newContainer("best-effort", getResourceList("", ""), getResourceList("", "")),
+			}),
+			expected: BestEffort,
+		},
+		{
+			pod: newPod("best-effort-guaranteed", []api.Container{
+				newContainer("best-effort", getResourceList("", ""), getResourceList("", "")),
+				newContainer("guaranteed", getResourceList("10m", "100Mi"), getResourceList("10m", "100Mi")),
+			}),
+			expected: BestEffort,
+		},
+		{
+			pod: newPod("best-effort-cpu-guaranteed-memory", []api.Container{
+				newContainer("best-effort", getResourceList("", "100Mi"), getResourceList("", "100Mi")),
+			}),
+			expected: BestEffort,
+		},
+		{
+			pod: newPod("burstable", []api.Container{
+				newContainer("burstable", getResourceList("10m", "100Mi"), getResourceList("100m", "200Mi")),
+			}),
+			expected: Burstable,
+		},
+		{
+			pod: newPod("guaranteed", []api.Container{
+				newContainer("guaranteed", getResourceList("100m", "100Mi"), getResourceList("100m", "100Mi")),
+			}),
+			expected: Guaranteed,
+		},
+	}
+	for _, testCase := range testCases {
+		if actual := GetPodQos(testCase.pod); testCase.expected != actual {
+			t.Errorf("invalid qos pod %s, expected: %s, actual: %s", testCase.pod.Name, testCase.expected, actual)
+		}
+	}
+}