web47core 3.2.3.44 → 3.2.3.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3adced90c2a22503ee987e0c720d5ea1e007f4fbc656dbc90bdc7fa7cf075ae8
-  data.tar.gz: 9e3018472076d431cccfa4009d08ab6bfdb91e5bad5e803cf11a3d3de913847f
+  metadata.gz: 8870399f95e59eac84d25e3752f2e8694986a76c609471ce639d11d0939ff540
+  data.tar.gz: 37e7ff4979d9fda9e459969949e2b2108ce87eaee88ecb015dd36883c8384e07
 SHA512:
-  metadata.gz: c8879b69e2ec9d801ee359c6be12100d80c6df3c45e849241acba09a17cc704049339b8fb68e6d4faf41c09e62ba60cc793d5ba21aca3dd4b7a0de0e644bd8ea
-  data.tar.gz: 1535db52112c0f4f5019fc3b5d9230ab284c3938f27093543f3142f344cc26a61f840fc6e33663b4ef9de242de10b3633f83532bc5e78c46b4fc9df3d6227a03
+  metadata.gz: aa0b881dc84f4f54c6e18ab89f1719b633a5c1538871aa9c4079b5c8c4c84f7e69e1bbdd7e86ca13880cf454ea5b653ddd89a00caca8ebebb232ea2dbb5603f1
+  data.tar.gz: 3c3b5e02b342e9afa8dbccfab990f7d7d44e284eef1c59ea19ed79e42a74c3636e727a298f7f5dce073532e4365e501ea8da98640dd584639f11f1b6ae5af91d

data/lib/app/services/auto_scaler.rb

@@ -5,10 +5,13 @@ require 'singleton'
 #
 # Resize the ECS worker service from the current thread.
 #
-# check runs after the primary cron server has launched due jobs.
-# warm_up raises the fleet to a floor. bump_worker adds one worker.
-# Neither call lowers a fleet that is already larger, except check when the
-# ladder maps the queue to zero workers.
+# check runs after the primary cron server has launched due jobs and follows
+# the worker ladder. It does not shrink the fleet while any job is still
+# queued, including when the ladder maps that depth to zero workers. It
+# scales to zero only when the queue is empty.
+# warm_up raises the fleet to at least the requested floor. bump_worker adds
+# one worker. Neither call consults the ladder or the queue, and neither
+# lowers a fleet that is already larger.
 #
 # A host project replaces the ladder at boot:
 #
@@ -59,21 +62,23 @@ class AutoScaler
   def check
     return unless configured?
 
-    apply_target(desired_for(delayed_jobs_count))
+    job_count = delayed_jobs_count
+    apply_target(desired_for(job_count), job_count: job_count)
   end
 
   #
-  # Raise the ECS desired count to at least min. Never lowers the fleet.
+  # Raise the ECS desired count to at least min. Ignores the ladder and the
+  # queue. Never lowers the fleet.
   #
   def warm_up(min: 1)
     return unless configured?
 
-    target = [[min.to_i, 1].max, max_worker_count].min
-    scale_to(target)
+    scale_to([min.to_i, 1].max)
   end
 
   #
-  # Add one worker to the live ECS desired count, capped at the ladder maximum.
+  # Add one worker to the live ECS desired count. Ignores the ladder and the
+  # queue.
   #
   def bump_worker
     return unless configured?
@@ -81,7 +86,7 @@ class AutoScaler
     current = live_desired_count
     return if current.nil?
 
-    scale_to([current + 1, max_worker_count].min, current: current)
+    scale_to(current + 1, current: current)
   end
 
   def reset
@@ -90,12 +95,22 @@ class AutoScaler
 
   private
 
-  def apply_target(target)
-    record_desired(target)
+  def apply_target(target, job_count:)
     current = live_desired_count
-    return if current.nil?
-    return if target.positive? && target <= current
-    return if target.zero? && current.zero?
+    if current.nil?
+      record_desired(target)
+      return
+    end
+
+    # Keep the live fleet while any job remains. The ladder still chooses a
+    # larger fleet. Scale down only once the queue is empty.
+    if job_count.positive? && target < current
+      record_desired(current)
+      return
+    end
+
+    record_desired(target)
+    return if target == current
 
     update_service(target)
   end
@@ -115,10 +130,6 @@ class AutoScaler
     worker_ladder.last.last
   end
 
-  def max_worker_count
-    worker_ladder.map(&:last).max
-  end
-
   def worker_ladder
     Web47core::Config.worker_ladder.presence || DEFAULT_WORKER_LADDER
   end

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '3.2.3.44'
+  VERSION = '3.2.3.45'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.44
+  version: 3.2.3.45
 platform: ruby
 authors:
 - Chris Schroeder