switchman 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697ce16e90d84de2535fdbf6dacc40640323dddffa4becb4a3d5e8c3b4d1a67f
-  data.tar.gz: b94f2c678d8dd4d03c7dd089c441ced5a75923778c972a86a7cc3f20c126bc97
+  metadata.gz: af9f8893be986771668662ceca8d3e36e28f5babf889a18e1e3efc237f7eae66
+  data.tar.gz: 675bd5b18076e8da86feb8a6e6271fffc1cd27939dedc1eb51c61bf165122b63
 SHA512:
-  metadata.gz: 82dff35e613f3f9147e7575f1865402df57375dd8f8396ae6f61ad86cf82ec401098b4210eecabb8596c9d7dbba3a3a3ba87c030d7b17b74aae1605cfc3efac9
-  data.tar.gz: 8678d9c29a485baf8bc483d3c6717d4e2c88d2de14e51e4356a656b579bd0c65579274e0afd70a94d2fb1bc8c617b44a47d73bb04cd8a0b41f1ad2a378ff7e38
+  metadata.gz: aadb4a342920dfe24e6110546380aa83a9aa4f61722e8c4c7265d0bf4494a2e8e04975d00504f7a26f143b87595bdb8c47ea09b4f9344f4925af08055c9d23e5
+  data.tar.gz: 295a3b4490f511380dcaeb44a6a6985cdf97745e678054eaf46315fc89d3adafd7a84a7a3665ec4521a6baa3b9f787adfccdc6d814baab10999c148b75041773

data/app/models/switchman/shard.rb

@@ -718,6 +718,7 @@ module Switchman
         Switchman.cache.delete(['shard', id].join('/'))
         Switchman.cache.delete("default_shard") if default?
       end
+      self.class.clear_cache
     end
 
     def default_name

data/db/migrate/20180828183945_add_default_shard_index.rb

@@ -10,6 +10,6 @@ class AddDefaultShardIndex < ActiveRecord::Migration[4.2]
               else
                 {}
               end
-    add_index :switchman_shards, :default, options
+    add_index :switchman_shards, :default, **options
   end
 end

data/lib/switchman/active_record/connection_handler.rb

@@ -135,7 +135,7 @@ module Switchman
             primary_pool = retrieve_connection_pool("primary")
             if primary_pool.is_a?(ConnectionPoolProxy)
               pool = ConnectionPoolProxy.new(spec_name.to_sym, primary_pool.default_pool, @shard_connection_pools)
-              pool.schema_cache.copy_values(primary_pool.schema_cache)
+              pool.schema_cache.copy_references(primary_pool.schema_cache)
               pool
             else
               primary_pool

data/lib/switchman/active_record/migration.rb

@@ -30,10 +30,42 @@ module Switchman
     end
 
     module Migrator
+      # significant change: hash shard id, not database name
       def generate_migrator_advisory_lock_id
-        shard_name_hash = Zlib.crc32("#{Shard.current.id}:#{Shard.current.name}")
+        shard_name_hash = Zlib.crc32(Shard.current.name)
         ::ActiveRecord::Migrator::MIGRATOR_SALT * shard_name_hash
       end
+
+      if ::Rails.version >= '6.0'
+        # copy/paste from Rails 6.1
+        def with_advisory_lock
+          lock_id = generate_migrator_advisory_lock_id
+
+          with_advisory_lock_connection do |connection|
+            got_lock = connection.get_advisory_lock(lock_id)
+            raise ::ActiveRecord::ConcurrentMigrationError unless got_lock
+            load_migrated # reload schema_migrations to be sure it wasn't changed by another process before we got the lock
+            yield
+          ensure
+            if got_lock && !connection.release_advisory_lock(lock_id)
+              raise ::ActiveRecord::ConcurrentMigrationError.new(
+                ::ActiveRecord::ConcurrentMigrationError::RELEASE_LOCK_FAILED_MESSAGE
+              )
+            end
+          end
+        end
+
+        # significant change: strip out prefer_secondary from config
+        def with_advisory_lock_connection
+          pool = ::ActiveRecord::ConnectionAdapters::ConnectionHandler.new.establish_connection(
+            ::ActiveRecord::Base.connection_config.except(:prefer_secondary)
+          )
+
+          pool.with_connection { |connection| yield(connection) }
+        ensure
+          pool&.disconnect!
+        end
+      end
     end
 
     module MigrationContext

data/lib/switchman/connection_pool_proxy.rb

@@ -84,6 +84,10 @@ module Switchman
       @schema_cache
     end
 
+    def set_schema_cache(cache)
+      @schema_cache.copy_values(cache)
+    end
+
     %w{release_connection
        disconnect!
        flush!

data/lib/switchman/schema_cache.rb

@@ -5,14 +5,22 @@ module Switchman
     delegate :connection, to: :pool
     attr_reader :pool
 
+    SHARED_IVS = %i{@columns @columns_hash @primary_keys @data_sources @indexes}.freeze
+
     def initialize(pool)
       @pool = pool
       super(nil)
     end
 
     def copy_values(other_cache)
+      SHARED_IVS.each do |iv|
+        instance_variable_get(iv).replace(other_cache.instance_variable_get(iv))
+      end
+    end
+
+    def copy_references(other_cache)
       # use the same cached values but still fall back to the correct pool
-      [:@columns, :@columns_hash, :@primary_keys, :@data_sources].each do |iv|
+      SHARED_IVS.each do |iv|
         instance_variable_set(iv, other_cache.instance_variable_get(iv))
       end
     end

data/lib/switchman/test_helper.rb

@@ -24,7 +24,7 @@ module Switchman
         else
           server1 = Shard.default.database_server
         end
-        server2 = DatabaseServer.create(Shard.default.database_server.config)
+        server2 = DatabaseServer.create(Shard.default.database_server.config.merge(server2: true))
 
         if server1 == Shard.default.database_server && server1.config[:shard1] && server1.config[:shard2]
           # look for the shards in the db already

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Cody Cutrer
 - James Williams
 - Jacob Fugal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -257,7 +257,7 @@ homepage: http://www.instructure.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,8 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Rails sharding magic
 test_files: []