Merge pull request #27 from practo/bug-scaling

Scale up above 1 only when only above target
practo · Aug 26, 2019 · ab7e4e1 · ab7e4e1
2 parents 1e99036 + b0be513
commit ab7e4e1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -375,6 +375,11 @@ func (c *Controller) getDesiredWorkers(
 		if math.Abs(1.0-usageRatio) <= tolerance {
 			return currentWorkers
 		}
+
+		if queueMessages < targetMessagesPerWorker {
+			return currentWorkers
+		}
+
 		desiredWorkers := int32(math.Ceil(usageRatio * float64(currentWorkers)))
 		// to prevent scaling down of workers which could be doing processing
 		if desiredWorkers < currentWorkers {
@@ -383,7 +388,7 @@ func (c *Controller) getDesiredWorkers(
 		return convertDesiredReplicasWithRules(desiredWorkers, minWorkers, maxWorkers)
 	}
 
-	if idleWorkers != 0 {
+	if idleWorkers > 0 {
 		desiredWorkers := currentWorkers - idleWorkers
 		return convertDesiredReplicasWithRules(desiredWorkers, minWorkers, maxWorkers)
 	}