ensure the redis cluster is available on the RedisClient object

refs AE-1191 Change-Id: I9086994eb096cdcd18f605b96b81136e005905ff Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/362051 Tested-by: Service Cloud Jenkins <[email protected]> Reviewed-by: Jacob Burroughs <[email protected]> QA-Review: Aaron Ogata <[email protected]> Product-Review: Aaron Ogata <[email protected]>
instructure · Nov 8, 2024 · 8ea85eb · 8ea85eb
1 parent 3b02fcb
commit 8ea85eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/config/initializers/cache_store.rb b/config/initializers/cache_store.rb
@@ -58,7 +58,11 @@
       cache_map[cluster] = if last_cluster_cache_config == config
                              Switchman.config[:cache_map][cluster]
                            else
-                             Canvas.lookup_cache_store(config, cluster)
+                             store = Canvas.lookup_cache_store(config, cluster)
+                             # The `.client` method is reserved for the actual redis CLIENT command, but we need the RubyClient object
+                             # which is represented by `_client`.`
+                             store.redis._client.ring = cluster
+                             store
                            end
     end
 

diff --git a/gems/canvas_cache/lib/canvas_cache/redis.rb b/gems/canvas_cache/lib/canvas_cache/redis.rb
@@ -64,6 +64,10 @@ def pipelined(_key = nil, **kwargs, &)
       # rubocop:enable Style/ArgumentsForwarding
     end
 
+    module TaggedRing
+      attr_accessor :ring
+    end
+
     module Distributed
       def initialize(addresses, options = {})
         options[:ring] ||= HashRing.new([], options[:replicas], options[:digest])
@@ -168,6 +172,7 @@ def patch
         ::Redis.prepend(Redis)
         ::Redis.prepend(IgnorePipelinedKey)
         ::RedisClient.prepend(Client)
+        ::RedisClient.prepend(TaggedRing)
         ::Redis::Cluster::Client.prepend(Cluster)
         ::RedisClient::Cluster.prepend(IgnorePipelinedKey)
         ::Redis::Client.prepend(Client)