Merge pull request #34503 from derekwaynecarr/fix-qos

Automatic merge from submit-queue Fix edge case in qos evaluation If a pod has a container C1 and C2, where sum(C1.requests, C2.requests) equals (C1.Limits), the code was reporting that the pod had "Guaranteed" qos, when it should have been Burstable. /cc @vishh @dchen1107

Merge pull request #34503 from derekwaynecarr/fix-qos
5ff8829b · Kubernetes Submit Queue · GitHub · e9ecbd9c · aeed9cab · 5ff8829b
Commit 5ff8829b authored Oct 15, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 1 deletion

qos.go pkg/kubelet/qos/qos.go +4 -1

qos_test.go pkg/kubelet/qos/qos_test.go +13 -0

No files found.
--- a/pkg/kubelet/qos/qos.go
+++ b/pkg/kubelet/qos/qos.go
@@ -68,11 +68,13 @@ func GetPodQOS(pod *api.Pod) QOSClass {
 			}
 		}
 		// process limits
+		qosLimitsFound := sets.NewString()
 		for name, quantity := range container.Resources.Limits {
 			if !supportedQoSComputeResources.Has(string(name)) {
 				continue
 			}
 			if quantity.Cmp(zeroQuantity) == 1 {
+				qosLimitsFound.Insert(string(name))
 				delta := quantity.Copy()
 				if _, exists := limits[name]; !exists {
 					limits[name] = *delta
@@ -82,7 +84,8 @@ func GetPodQOS(pod *api.Pod) QOSClass {
 				}
 			}
 		}
-		if len(limits) != len(supportedQoSComputeResources) {
+
+		if len(qosLimitsFound) != len(supportedQoSComputeResources) {
 			isGuaranteed = false
 		}
 	}

--- a/pkg/kubelet/qos/qos_test.go
+++ b/pkg/kubelet/qos/qos_test.go
@@ -136,6 +136,12 @@ func TestGetPodQOS(t *testing.T) {
 			expected: Burstable,
 		},
 		{
+			pod: newPod("burstable-no-limits", []api.Container{
+				newContainer("burstable", getResourceList("100m", "100Mi"), getResourceList("", "")),
+			}),
+			expected: Burstable,
+		},
+		{
 			pod: newPod("burstable-guaranteed", []api.Container{
 				newContainer("burstable", getResourceList("1", "100Mi"), getResourceList("2", "100Mi")),
 				newContainer("guaranteed", getResourceList("100m", "100Mi"), getResourceList("100m", "100Mi")),
@@ -143,6 +149,13 @@ func TestGetPodQOS(t *testing.T) {
 			expected: Burstable,
 		},
 		{
+			pod: newPod("burstable-unbounded-but-requests-match-limits", []api.Container{
+				newContainer("burstable", getResourceList("100m", "100Mi"), getResourceList("200m", "200Mi")),
+				newContainer("burstable-unbounded", getResourceList("100m", "100Mi"), getResourceList("", "")),
+			}),
+			expected: Burstable,
+		},
+		{
 			pod: newPod("burstable-1", []api.Container{
 				newContainer("burstable", getResourceList("10m", "100Mi"), getResourceList("100m", "200Mi")),
 			}),