From 8f57233a3a98e9ccf6a818da180b18c5f52d8858 Mon Sep 17 00:00:00 2001 From: BinacsLee Date: Wed, 21 Apr 2021 17:40:35 +0800 Subject: [PATCH] code cleanup: scheduler/framework use max function instead of if-condition in types.go --- pkg/scheduler/framework/types.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkg/scheduler/framework/types.go b/pkg/scheduler/framework/types.go index a2efff767c2..2c037bd8357 100644 --- a/pkg/scheduler/framework/types.go +++ b/pkg/scheduler/framework/types.go @@ -554,25 +554,16 @@ func (r *Resource) SetMaxResource(rl v1.ResourceList) { for rName, rQuantity := range rl { switch rName { case v1.ResourceMemory: - if mem := rQuantity.Value(); mem > r.Memory { - r.Memory = mem - } + r.Memory = max(r.Memory, rQuantity.Value()) case v1.ResourceCPU: - if cpu := rQuantity.MilliValue(); cpu > r.MilliCPU { - r.MilliCPU = cpu - } + r.MilliCPU = max(r.MilliCPU, rQuantity.MilliValue()) case v1.ResourceEphemeralStorage: if utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) { - if ephemeralStorage := rQuantity.Value(); ephemeralStorage > r.EphemeralStorage { - r.EphemeralStorage = ephemeralStorage - } + r.EphemeralStorage = max(r.EphemeralStorage, rQuantity.Value()) } default: if schedutil.IsScalarResourceName(rName) { - value := rQuantity.Value() - if value > r.ScalarResources[rName] { - r.SetScalar(rName, value) - } + r.SetScalar(rName, max(r.ScalarResources[rName], rQuantity.Value())) } } }