panda_pal 5.17.1 → 5.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f32b5b78d11428c9f4be64fc963ae2fac80cae44abfd66dcda0f39be8b17006
-  data.tar.gz: cb494809a3aa72956b16bad0b7b17ba095156a1c4a7fa7261a51738d92442630
+  metadata.gz: 1d2cfdbfc9d2c60cc080b545d2ee582ce212623a45c286d8610b8ac5f6c1af37
+  data.tar.gz: 4918d3bee6808bfbf22e98e23f3cbedcd493d4ec7c946ac67e0c8ca5485d9eca
 SHA512:
-  metadata.gz: 7819962aa331b91ae3b6ad0d95fdb8e5bf314d691cdaa4f120a1f12b199d26c916a811b9f071b9fd73802c8893ae70b6a6158a7ea9457b602f1ea2aa496d4092
-  data.tar.gz: 5cfd2d2f902e658968b3ce2ce2495c5a58e605071db2c97436186b2893f178d2c198856ac42acd9371f6462d108a2a959834958b84ad1fa9d4f9c0740686cc93
+  metadata.gz: 0e06e419047c6a29e1ed8f03966bae4c31ed9e5b57ad6953133b890f6dab407d384ea1f071e0c88e01f7a69ef790f9b132f98a973aa3602b6b902d4871722799
+  data.tar.gz: 6d19e0a9ea13914f8045d62525dd73dcb97aadfc780dc1c4907fe3b80df9483144d1cc3cc087d509aa7cfba344aa64aaa4b7bd36b05fea354201d7e387094db4

data/config/initializers/apartment.rb

@@ -148,10 +148,7 @@ module Apartment
 
         raise ActiveRecord::StatementInvalid, "PandaPal/Apartment Mutli-DB support does not currently support DB roles" if ActiveRecord::Base.current_role != ActiveRecord::Base.default_role
 
-        unless ActiveRecord::Base.connected?
-          Apartment.establish_connection multi_tenantify(tenant, false)
-          Apartment.connection.verify!
-        end
+        establish_connection_pool(tenant) unless connection_pool_registered?
 
         Apartment.connection.enable_query_cache! if query_cache_enabled
 
@@ -171,6 +168,25 @@ module Apartment
 
       protected
 
+      ESTABLISH_CONNECTION_LOCK = Mutex.new
+
+      def connection_pool_registered?
+        !ActiveRecord::Base.connection_handler.retrieve_connection_pool(
+          ActiveRecord::Base.connection_specification_name,
+          role: ActiveRecord::Base.current_role,
+          shard: ActiveRecord::Base.current_shard,
+        ).nil?
+      end
+
+      def establish_connection_pool(tenant)
+        ESTABLISH_CONNECTION_LOCK.synchronize do
+          next if connection_pool_registered?
+
+          Apartment.establish_connection multi_tenantify(tenant, false)
+          Apartment.connection.verify!
+        end
+      end
+
       def persistent_schemas
         map_to_schemas(super)
       end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = '5.17.1'
+  VERSION = '5.17.2'
 end

data/spec/core/apartment_multidb_spec.rb

@@ -53,6 +53,72 @@ RSpec.describe PandaPal::Organization, type: :model do
       expect(PandaPal::ApiCall.connection.exec_query("SELECT current_database()").pluck("current_database")[0]).to eq("panda_pal_test2")
     end
 
+    context "connection pool lifecycle" do
+      def alt_pool
+        ActiveRecord::Base.connection_handler.retrieve_connection_pool(
+          ActiveRecord::Base.connection_specification_name,
+          role: ActiveRecord::Base.current_role,
+          shard: "apt:alt",
+        )
+      end
+
+      def count_establish_connection_calls
+        calls = Queue.new
+        allow(Apartment).to receive(:establish_connection).and_wrap_original do |original, *args, **kwargs|
+          calls << true
+          original.call(*args, **kwargs)
+        end
+        yield
+        calls.size
+      end
+
+      def switch_in_threads(tenant, count)
+        start = Queue.new
+        threads = count.times.map do
+          Thread.new do
+            start.pop
+            Apartment::Tenant.switch(tenant) { PandaPal::ApiCall.count }
+          ensure
+            ActiveRecord::Base.connection_handler.clear_active_connections!
+          end
+        end
+        count.times { start << true }
+        threads.map(&:value)
+      end
+
+      it "reuses an existing shard pool whose connections have all been closed" do
+        org2.switch_tenant { PandaPal::ApiCall.count }
+        pool = alt_pool
+        ActiveRecord::Base.connection_handler.clear_active_connections!
+        pool.disconnect!
+
+        calls = count_establish_connection_calls do
+          org2.switch_tenant { expect(PandaPal::ApiCall.count).to eq(0) }
+        end
+
+        expect(calls).to eq(0)
+        expect(alt_pool).to equal(pool)
+      end
+
+      it "establishes a missing shard pool once when many threads need it at the same time" do
+        org2.switch_tenant { PandaPal::ApiCall.count }
+        ActiveRecord::Base.connection_handler.clear_active_connections!
+        ActiveRecord::Base.connection_handler.remove_connection_pool(
+          ActiveRecord::Base.connection_specification_name,
+          role: ActiveRecord::Base.current_role,
+          shard: "apt:alt",
+        )
+
+        results = nil
+        calls = count_establish_connection_calls do
+          results = switch_in_threads("alt:on_alt", 8)
+        end
+
+        expect(results).to eq([0] * 8)
+        expect(calls).to eq(1)
+      end
+    end
+
     # load_async is a Rails 7.0+ feature.
     context "load_async", skip: (ActiveRecord::Relation.method_defined?(:load_async) ? false : "requires Rails 7.0+ load_async") do
       it "works across shards" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.17.1
+  version: 5.17.2
 platform: ruby
 authors:
 - Instructure CustomDev