switchman 3.0.19 → 3.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eea092610f18550e6ab0d24baa9a2746e8452341116c0b5e3a94c15b1bcb9be0
-  data.tar.gz: 53e0c2f7735838283311e57017de6bf020aae61f38dd394821a5bab5fdda869e
+  metadata.gz: 1e131a4d625dcfe3ff7854591e717574e3fddf49e29cb9a5aa2e1cc9df8c2f10
+  data.tar.gz: 385c067530063b6d4bcdc3f7f0463a57a54082c14be4e00ddf1f520ea5fabb26
 SHA512:
-  metadata.gz: da4096ca84676fecda1bee5e99a9e7e34c1d4cc2233e4a32f391d68ccd9d93a8d641b5d4a5ecd330e5df340daca8611bad0226709ba9f9fc6653282821216e0a
-  data.tar.gz: d8a6f2245ac58e5ab64398245f7b14188cdb4675dea430fc2dd256b5aea73f68a81a30f5bcd3cd626634c492932bf85f3becab5dfa0a6e773abc6639615ab247
+  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

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)
@@ -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.19'
+  VERSION = '3.0.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.20
 platform: ruby
 authors:
 - Cody Cutrer