switchman 4.3.3 → 4.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4437e8d734e3c009a9d46806e1030d9afa36701db8999c28c9892e2db7b1171e
-  data.tar.gz: 10cbc99e69f2a32d87a9f3c0b19d183124aeb2c10ddd88575a8f0dec86125efb
+  metadata.gz: 756e8de301a68ac11f33a55bf4686cfa5deb9ff15f40b8750a9ec9ade881e136
+  data.tar.gz: 347370745f986e5b63bcc2c11c8855d5ca1a9c08d79e0f8b66d60552b0cbaa1b
 SHA512:
-  metadata.gz: 516ded0cd496113906deefabc1a05908d0ac865913c790cf92e26b665b60617b56221952d84936bdbf9ffef48ab5d0fa66425575c85c0448b19f0d35725afd3d
-  data.tar.gz: 26c13f7b3915f62c92506b68814888374d00eb4a20e982fd038cf962675a7de2df4188a8c8fbcdeffe7caddb3d68e1c1fd5f92ad29949c72889d594c9e93d47d
+  metadata.gz: 6f50f01e9566f118a4bbc89a4aa30fabc8ed00d34fc020c84856ab5c027aa912b57462c7a5658f7b330eaed4308d121703266f441b9b1e451dcf4a2bf3e8ee3e
+  data.tar.gz: 3146ef11b0fa04471c63c0bc74bb4344d15fc08a833bfbd878a5be82cfd024a2f6c2516bef2961e8032164f16db367c2b96aaf421032d2b7e10b4a3e599b00eb

data/lib/switchman/database_server.rb

@@ -306,9 +306,14 @@ module Switchman
 
     def primary_shard_id
       unless instance_variable_defined?(:@primary_shard_id)
-        # if sharding isn't fully set up yet, we may not be able to query the shards table
-        @primary_shard_id = Shard.default.id if Shard.default.database_server == self
-        @primary_shard_id ||= shards.where(name: nil).first&.id
+        @primary_shard_id = Shard.default.activate do
+          Switchman.cache.fetch(["db_server_primary_shard_id", id]) do
+            # if sharding isn't fully set up yet, we may not be able to query the shards table
+            break Shard.default.id if Shard.default.database_server == self
+
+            shards.where(name: nil).first&.id
+          end
+        end
       end
       @primary_shard_id
     end

data/lib/switchman/shard.rb

@@ -154,12 +154,12 @@ module Switchman
           missing = shard_ids - cached_shards.keys
           return if missing.empty?
 
-          found = where(id: missing).index_by(&:id)
+          found = where(id: missing).select(&:database_server).index_by(&:id) # exclude shards w/o database servers
           missing.each { |id| found[id] = nil unless found.key?(id) } # cache nonexistence of shards
           cached_shards.reverse_merge!(found)
         else
           cached_shards.reverse_merge!(active_shards.values.index_by(&:id))
-          cached_shards.reverse_merge!(all.index_by(&:id))
+          cached_shards.reverse_merge!(all.select(&:database_server).index_by(&:id))
         end
       end
 
@@ -681,6 +681,9 @@ module Switchman
       Shard.default.activate do
         Switchman.cache.delete(["shard", id].join("/"))
         Switchman.cache.delete("default_shard") if default?
+        if database_server && (self[:name].nil? || name_before_last_save.nil?)
+          Switchman.cache.delete(["db_server_primary_shard_id", database_server.id])
+        end
       end
       self.class.clear_cache
     end

data/lib/switchman/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.5
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-26 00:00:00.000000000 Z
+date: 2026-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord