Skip to content

Fix precision of cpu to millicore and memory to Mi #8409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Apr 19, 2016
Merged

Fix precision of cpu to millicore and memory to Mi #8409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions pkg/quota/admission/clusterresourceoverride/admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ const (
)

var (
zeroDec = inf.NewDec(0, 0)
zeroDec = inf.NewDec(0, 0)
miDec = inf.NewDec(1024*1024, 0)
cpuFloor = resource.MustParse("1m")
memFloor = resource.MustParse("1Mi")
)

func init() {
Expand Down Expand Up @@ -153,24 +156,37 @@ func (a *clusterResourceOverridePlugin) Admit(attr admission.Attributes) error {
resources := container.Resources
memLimit, memFound := resources.Limits[kapi.ResourceMemory]
if memFound && a.config.memoryRequestToLimitRatio.Cmp(zeroDec) != 0 {
resources.Requests[kapi.ResourceMemory] = resource.Quantity{
Amount: multiply(memLimit.Amount, a.config.memoryRequestToLimitRatio),
Format: resource.BinarySI,
// memory is measured in whole bytes.
// the plugin rounds down to the nearest MiB rather than bytes to improve ease of use for end-users.
amount := multiply(memLimit.Amount, a.config.memoryRequestToLimitRatio)
roundDownToNearestMi := multiply(divide(amount, miDec, 0, inf.RoundDown), miDec)
value := resource.Quantity{Amount: roundDownToNearestMi, Format: resource.BinarySI}
if memFloor.Cmp(value) > 0 {
value = *(memFloor.Copy())
}
resources.Requests[kapi.ResourceMemory] = value
}
if memFound && a.config.limitCPUToMemoryRatio.Cmp(zeroDec) != 0 {
resources.Limits[kapi.ResourceCPU] = resource.Quantity{
// float math is necessary here as there is no way to create an inf.Dec to represent cpuBaseScaleFactor < 0.001
Amount: multiply(inf.NewDec(int64(float64(memLimit.Value())*cpuBaseScaleFactor), 3), a.config.limitCPUToMemoryRatio),
Format: resource.DecimalSI,
// float math is necessary here as there is no way to create an inf.Dec to represent cpuBaseScaleFactor < 0.001
// cpu is measured in millicores, so we need to scale and round down the value to nearest millicore scale
amount := multiply(inf.NewDec(int64(float64(memLimit.Value())*cpuBaseScaleFactor), 3), a.config.limitCPUToMemoryRatio)
amount.Round(amount, 3, inf.RoundDown)
value := resource.Quantity{Amount: amount, Format: resource.DecimalSI}
if cpuFloor.Cmp(value) > 0 {
value = *(cpuFloor.Copy())
}
resources.Limits[kapi.ResourceCPU] = value
}
cpuLimit, cpuFound := resources.Limits[kapi.ResourceCPU]
if cpuFound && a.config.cpuRequestToLimitRatio.Cmp(zeroDec) != 0 {
resources.Requests[kapi.ResourceCPU] = resource.Quantity{
Amount: multiply(cpuLimit.Amount, a.config.cpuRequestToLimitRatio),
Format: resource.DecimalSI,
// cpu is measured in millicores, so we need to scale and round down the value to nearest millicore scale
amount := multiply(cpuLimit.Amount, a.config.cpuRequestToLimitRatio)
amount.Round(amount, 3, inf.RoundDown)
value := resource.Quantity{Amount: amount, Format: resource.DecimalSI}
if cpuFloor.Cmp(value) > 0 {
value = *(cpuFloor.Copy())
}
resources.Requests[kapi.ResourceCPU] = value
}
}
glog.V(5).Infof("%s: pod limits after overrides are: %#v", api.PluginName, pod.Spec.Containers[0].Resources)
Expand All @@ -180,3 +196,7 @@ func (a *clusterResourceOverridePlugin) Admit(attr admission.Attributes) error {
func multiply(x *inf.Dec, y *inf.Dec) *inf.Dec {
return inf.NewDec(0, 0).Mul(x, y)
}

func divide(x *inf.Dec, y *inf.Dec, s inf.Scale, r inf.Rounder) *inf.Dec {
return inf.NewDec(0, 0).QuoRound(x, y, s, r)
}
40 changes: 35 additions & 5 deletions pkg/quota/admission/clusterresourceoverride/admission_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,23 @@ func TestLimitRequestAdmission(t *testing.T) {
namespace *kapi.Namespace
}{
{
name: "this thing even runs",
name: "ignore pods that have no memory limit specified",
config: testConfig(100, 50, 50),
object: testPod("0", "0", "0", "0"),
object: testBestEffortPod(),
expectedMemRequest: resource.MustParse("0"),
expectedCpuLimit: resource.MustParse("0"),
expectedCpuRequest: resource.MustParse("0"),
namespace: fakeNamespace(true),
},
{
name: "test floor for memory and cpu",
config: testConfig(100, 50, 50),
object: testPod("1Mi", "0", "0", "0"),
expectedMemRequest: resource.MustParse("1Mi"),
expectedCpuLimit: resource.MustParse("1m"),
expectedCpuRequest: resource.MustParse("1m"),
namespace: fakeNamespace(true),
},
{
name: "nil config",
config: nil,
Expand Down Expand Up @@ -184,12 +193,21 @@ func TestLimitRequestAdmission(t *testing.T) {
namespace: fakeNamespace(true),
},
{
name: "little values don't get lost",
name: "little values mess things up",
config: testConfig(500, 10, 10),
object: testPod("1.024Mi", "0", "0", "0"),
expectedMemRequest: resource.MustParse(".0001Gi"),
expectedMemRequest: resource.MustParse("1Mi"),
expectedCpuLimit: resource.MustParse("5m"),
expectedCpuRequest: resource.MustParse(".5m"),
expectedCpuRequest: resource.MustParse("1m"),
namespace: fakeNamespace(true),
},
{
name: "test fractional memory requests round up",
config: testConfig(500, 10, 60),
object: testPod("512Mi", "0", "0", "0"),
expectedMemRequest: resource.MustParse("307Mi"),
expectedCpuLimit: resource.MustParse("2.5"),
expectedCpuRequest: resource.MustParse("250m"),
namespace: fakeNamespace(true),
},
}
Expand Down Expand Up @@ -231,6 +249,18 @@ func TestLimitRequestAdmission(t *testing.T) {
}
}

func testBestEffortPod() *kapi.Pod {
return &kapi.Pod{
Spec: kapi.PodSpec{
Containers: []kapi.Container{
{
Resources: kapi.ResourceRequirements{},
},
},
},
}
}

func testPod(memLimit string, memRequest string, cpuLimit string, cpuRequest string) *kapi.Pod {
return &kapi.Pod{
Spec: kapi.PodSpec{
Expand Down