Merge pull request #85 from iadvize/fix-scaling-order

fix(autoscaling): test out before in
jrasell · Oct 31, 2019 · 4de23a8 · 4de23a8
2 parents 6ad120c + 6f4d575
commit 4de23a8
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/pkg/autoscale/autoscale.go b/pkg/autoscale/autoscale.go
@@ -69,14 +69,6 @@ func (a *AutoScale) autoscaleJob(jobID string, policies map[string]*policy.Group
 		var count int
 
 		switch {
-		case cpuUsage < pol.ScaleInCPUPercentageThreshold:
-			scalingDir = scale.DirectionIn
-			count = pol.ScaleInCount
-			updateAutoscaleMeta(group, "cpu", cpuUsage, pol.ScaleInCPUPercentageThreshold, meta)
-		case memUsage < pol.ScaleInMemoryPercentageThreshold:
-			scalingDir = scale.DirectionIn
-			count = pol.ScaleInCount
-			updateAutoscaleMeta(group, "memory", memUsage, pol.ScaleInMemoryPercentageThreshold, meta)
 		case cpuUsage > pol.ScaleOutCPUPercentageThreshold:
 			scalingDir = scale.DirectionOut
 			count = pol.ScaleOutCount
@@ -85,6 +77,14 @@ func (a *AutoScale) autoscaleJob(jobID string, policies map[string]*policy.Group
 			scalingDir = scale.DirectionOut
 			count = pol.ScaleOutCount
 			updateAutoscaleMeta(group, "memory", memUsage, pol.ScaleOutMemoryPercentageThreshold, meta)
+		case cpuUsage < pol.ScaleInCPUPercentageThreshold:
+			scalingDir = scale.DirectionIn
+			count = pol.ScaleInCount
+			updateAutoscaleMeta(group, "cpu", cpuUsage, pol.ScaleInCPUPercentageThreshold, meta)
+		case memUsage < pol.ScaleInMemoryPercentageThreshold:
+			scalingDir = scale.DirectionIn
+			count = pol.ScaleInCount
+			updateAutoscaleMeta(group, "memory", memUsage, pol.ScaleInMemoryPercentageThreshold, meta)
 		}
 
 		if scalingDir != "" {