ros-apartment 4.0.0.alpha9 → 4.0.0.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b4b1a4532066ffd3ebfdfa8c43b0f0cdd4e304f31f9905af8a91550e71c44a6
-  data.tar.gz: 75868c2063131bc20022d35142d87aff2c15f7c8b65b7fa3d8cbee43be4f11d1
+  metadata.gz: d24210e257a6f61365a496b60f54762e4b0e9d5ef6f652d77891455fba01d6a4
+  data.tar.gz: dd1eb795e6ca4c9bc2b22377b2feb7fd8bd9fc66efdd3d1eaaeab891bd4fa7d3
 SHA512:
-  metadata.gz: 1f3c98442bf8ea826918440071a3a702615494d8761ef20f990135a10697650e05b72926f28a6cf1053b2aa969b67aee1b8c43249efe73ff58e8802c916f92a3
-  data.tar.gz: f23fd1d357e9b5b598516960a0d480f22512b0c8b4481827bb137cc074589a73d4684e4879dc1b2355a12a108fe1b25eaf54eff283aa6c89557c823d91a3e13a
+  metadata.gz: 2397d625268ff6c241eb7886834f99383e650a9613048d0c8d99594083d7cb450e3b328279f56d7c14b3babf70e9ca03069b5c5c507f3a3f06591a429c8283e8
+  data.tar.gz: 57ef4cf17beff1ee06a8abdaff9303b114be190c962f829de2465e766b1235664718e1bb534c8bee715657dbea45512c116f1467d20a287f7ea7c55e164822aa

data/lib/apartment/migrator.rb

@@ -146,10 +146,19 @@ module Apartment
     def migrate_tenant(tenant) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       start = monotonic_now
       Apartment::Current.migrating = true
+      tenant_pool = nil
 
       with_migration_role do
         Apartment::Tenant.switch(tenant) do
-          context = ActiveRecord::Base.connection_pool.migration_context
+          tenant_pool = ActiveRecord::Base.connection_pool
+          # Lease eagerly so the pool stays in_use? for the whole migration. This
+          # closes a capture->lease window: a parallel admission pass could
+          # otherwise evict the not-yet-leased pool, and the later lease_connection
+          # (in with_advisory_locks_disabled) would resolve a DIFFERENT replacement
+          # pool that this method's ensure would not release. It also guarantees the
+          # release below targets the pool that actually holds the lease.
+          tenant_pool.lease_connection
+          context = tenant_pool.migration_context
 
           unless @version || context.needs_migration?
             return Result.new(
@@ -186,6 +195,7 @@ module Apartment
       )
     ensure
       Apartment::Current.migrating = false
+      release_tenant_pool_connection(tenant, tenant_pool)
     end
 
     def run_sequential(tenants)
@@ -276,6 +286,25 @@ module Apartment
     # cannot re-escape the handler. Success-path instrumentation is left
     # un-isolated by design — only the failure path carries the hard no-raise
     # guarantee, and swallowing there would mask real subscriber bugs.
+    # Best-effort release of THIS worker's lease on the tenant pool, so the
+    # finished pool is no longer in_use? and becomes admission-evictable.
+    # Targeted (not handler-wide clear_active_connections!) so the shared
+    # sequential / migrate_one paths, which run on a caller-owned execution
+    # context, do not release a caller's other leases. A release failure must
+    # never mask the migration error or the returned Result, so it is swallowed
+    # and warned; the warn is nested-rescued because a broken $stderr raises
+    # IOError (a StandardError) — the same guard instrument_failure applies to
+    # its own warn. See docs/designs/v4-migrator-per-tenant-connection-release.md.
+    def release_tenant_pool_connection(tenant, pool)
+      pool&.release_connection
+    rescue StandardError => e
+      begin
+        warn "[Apartment::Migrator] connection release failed for #{tenant}: #{e.class}: #{e.message}"
+      rescue StandardError
+        nil
+      end
+    end
+
     def instrument_failure(tenant, error, duration)
       Instrumentation.instrument(:migrate_tenant_failed, tenant: tenant, error: error, duration: duration)
     rescue StandardError => e

data/lib/apartment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '4.0.0.alpha9'
+  VERSION = '4.0.0.alpha10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha9
+  version: 4.0.0.alpha10
 platform: ruby
 authors:
 - Ryan Brunner