switchman 3.0.17 → 3.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213adc61b124f8ba48e52259c47702cb601fdc9e0ef71c452c1eeee23dc94e46
-  data.tar.gz: f7982e2e7cb3efce13291382b7fa49f9cb0da87cfd5939581368ac5735ed3e00
+  metadata.gz: 1e131a4d625dcfe3ff7854591e717574e3fddf49e29cb9a5aa2e1cc9df8c2f10
+  data.tar.gz: 385c067530063b6d4bcdc3f7f0463a57a54082c14be4e00ddf1f520ea5fabb26
 SHA512:
-  metadata.gz: e3651c9824e8258c8854e0281ecbc081b42f3fa97524d90eb41ac701f9a5eb0bef53ea77a700c682ffa5913ea71aa7816044cfa408b051f20f4b96b86a4e5307
-  data.tar.gz: 8fac15d77c092790b6410bf15aaccef4c90243308970eddd29e2c9145281cde67e4d6572439b97966ecc2c5924557c7916aca8665e722530c2ead0d43dbcdab2
+  metadata.gz: e6c9d4e232befbbf02b1da406d9bae6fd67731b0942ea3c46d29b87b40f2e457e0f0a03edc14547dd3269d619d0f019beab415150229e8d4a2f395cb3a4e51ea
+  data.tar.gz: f6e536576fa2b1f33c2f641ba0dbf0fdb3e487706558efb2bb924af63b8bc939ed45ee491676d5887313d428e64d42cfc13604fc291e561127cd829ced728471

data/app/models/switchman/shard.rb

@@ -374,12 +374,12 @@ module Switchman
         shard || source_shard || Shard.current
       end
 
-      private
-
       def sharding_initialized
         @sharding_initialized ||= false
       end
 
+      private
+
       def add_sharded_model(klass)
         @sharded_models = (sharded_models + [klass]).freeze
         initialize_sharding
@@ -407,9 +407,13 @@ module Switchman
 
           klass.connects_to shards: connects_to_hash
         end
-        DatabaseServer.all.each { |db| db.guard! if db.config[:prefer_secondary] } unless @sharding_initialized
 
+        return if @sharding_initialized
+
+        # If we hadn't initialized sharding yet, the servers won't be guarded
+        # The order matters here or guard_servers will be a noop
         @sharding_initialized = true
+        DatabaseServer.guard_servers
       end
 
       # in-process caching

data/lib/switchman/active_record/base.rb

@@ -64,6 +64,17 @@ module Switchman
           current_role != current_role(without_overrides: true)
         end
 
+        def connected_to_stack
+          ret = super
+          # Really early in boot, DatabaseServer may not be loaded yet,
+          # which is fine since we will guard when we initialize sharding in that case
+          return ret unless const_defined?(:DatabaseServer)
+          return ret if Thread.current.thread_variable?(:ar_connected_to_stack)
+
+          DatabaseServer.guard_servers
+          ret
+        end
+
         # significant change: Allow per-shard roles
         def current_role(without_overrides: false)
           return super() if without_overrides
@@ -71,7 +82,7 @@ module Switchman
           sharded_role = nil
           connected_to_stack.reverse_each do |hash|
             shard_role = hash.dig(:shard_roles, current_shard)
-            if shard_role && (hash[:klasses].include?(Base) || hash[:klasses].include?(connection_classes))
+            if shard_role && (hash[:klasses].include?(::ActiveRecord::Base) || hash[:klasses].include?(connection_classes))
               sharded_role = shard_role
               break
             end

data/lib/switchman/active_record/database_configurations.rb

@@ -27,7 +27,9 @@ module Switchman
         return configs if configs.is_a?(Array)
 
         db_configs = configs.flat_map do |env_name, config|
-          roles = config.keys.select { |k| config[k].is_a?(Hash) }
+          # It would be nice to do the auto-fallback that we want here, but we haven't
+          # actually done that for years (or maybe ever) and it will be a big lift to get working
+          roles = config.keys.select { |k| config[k].is_a?(Hash) || (config[k].is_a?(Array) && config[k].all? { |ck| ck.is_a?(Hash) }) }
           base_config = config.except(*roles)
 
           name = "#{env_name}/primary"
@@ -35,7 +37,7 @@ module Switchman
           base_db = build_db_config_from_raw_config(env_name, name, base_config)
           [base_db] + roles.map do |role|
             build_db_config_from_raw_config(env_name, "#{env_name}/#{role}",
-                                            base_config.merge(config[role]))
+                                            base_config.merge(config[role].is_a?(Array) ? config[role].first : config[role]))
           end
         end
 

data/lib/switchman/database_server.rb

@@ -49,6 +49,10 @@ module Switchman
         servers[rand(servers.length)]
       end
 
+      def guard_servers
+        all.each { |db| db.guard! if db.config[:prefer_secondary] } if Shard.sharding_initialized
+      end
+
       private
 
       def reference_role(role)
@@ -71,7 +75,7 @@ module Switchman
             if role == 'primary'
               @database_servers[name] = DatabaseServer.new(config.env_name, config.configuration_hash)
             else
-              @database_servers[name].roles << role
+              @database_servers[name].roles << role.to_sym
             end
           end
         end
@@ -133,6 +137,7 @@ module Switchman
     # when doing writes (then it falls back to the current
     # value of GuardRail.environment)
     def guard!(environment = :secondary)
+      DatabaseServer.send(:reference_role, environment)
       ::ActiveRecord::Base.connected_to_stack << { shard_roles: { id.to_sym => environment }, klasses: [::ActiveRecord::Base] }
     end
 

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = '3.0.17'
+  VERSION = '3.0.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.20
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord