simplify redis_key

coinbase · Mar 3, 2021 · f677527 · f677527
1 parent e963fda
commit f677527
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/lib/master_lock/redis_lock.rb b/lib/master_lock/redis_lock.rb
@@ -95,13 +95,7 @@ def eval_script(script, script_hash, keys:, argv:)
     end
 
     def redis_key
-      # Key hash tags are a way to ensure multiple keys are allocated in the same hash slot.
-      # This allows our redis operations to work with clusters
-      if config.cluster
-        "{#{config.key_prefix}}:#{key}"
-      else
-        "#{config.key_prefix}:#{key}"
-      end
+      "#{config.key_prefix}:#{key}"
     end
 
     def redis

diff --git a/spec/master_lock/redis_lock_spec.rb b/spec/master_lock/redis_lock_spec.rb
@@ -60,11 +60,9 @@
     it "returns true when lock can be acquired" do
       expect(lock1.acquire(timeout: 0)).to eq(true)
       expect(redis.get('masterlock:key')).to_not be_nil
-      expect(redis.get('{masterlock}:key')).to be_nil
       # Cluster test
       expect(lock3.acquire(timeout: 0)).to eq(true)
-      expect(cluster.get('masterlock:key')).to be_nil
-      expect(cluster.get('{masterlock}:key')).to_not be_nil
+      expect(cluster.get('masterlock:key')).to_not be_nil
     end
 
     it "returns false when lock can not be acquired" do
@@ -138,29 +136,23 @@
     it "returns true when lock is held by owner" do
       lock1.acquire(timeout: 0)
       expect(redis.get('masterlock:key')).to_not be_nil
-      expect(redis.get('{masterlock}:key')).to be_nil
       expect(lock1.release).to eq(true)
       expect(redis.get('masterlock:key')).to be_nil
-      expect(redis.get('{masterlock}:key')).to be_nil
       # Cluster test
       lock3.acquire(timeout: 0)
-      expect(cluster.get('masterlock:key')).to be_nil
-      expect(cluster.get('{masterlock}:key')).to_not be_nil
+      expect(cluster.get('masterlock:key')).to_not be_nil
       expect(lock3.release).to eq(true)
       expect(cluster.get('masterlock:key')).to be_nil
-      expect(cluster.get('{masterlock}:key')).to be_nil
     end
 
     it "returns false when lock is held by another owner" do
       lock2.acquire(timeout: 0)
       expect(lock1.release).to eq(false)
       expect(redis.get('masterlock:key')).to_not be_nil
-      expect(redis.get('{masterlock}:key')).to be_nil
       # Cluster test
       lock4.acquire(timeout: 0)
       expect(lock3.release).to eq(false)
-      expect(cluster.get('masterlock:key')).to be_nil
-      expect(cluster.get('{masterlock}:key')).to_not be_nil
+      expect(cluster.get('masterlock:key')).to_not be_nil
     end
 
     it "returns false when lock is not held" do