add test to check for shard reuse and that we cleanup

Signed-off-by: Sandor Szücs <[email protected]>

Author: szuecs

export_test.go

@@ -93,3 +93,15 @@ func GetSlavesAddrByName(ctx context.Context, c *SentinelClient, name string) []
 	}
 	return parseReplicaAddrs(addrs, false)
 }
+
+func (c *Ring) GetAddr(addr string) *ringShard {
+	return c.shards.GetAddr(addr)
+}
+
+func (c *ringShards) GetAddr(addr string) *ringShard {
+	return c.shards[addr]
+}
+
+func (shard *ringShard) GetAddr() string {
+	return shard.addr
+}

ring_test.go

@@ -114,19 +114,25 @@ var _ = Describe("Redis Ring", func() {
 	})
 
 	Describe("[new] dynamic setting ring shards", func() {
-		It("uses one shard after setting it to one shard", func() {
+		It("downscale shard and check reuse shard, upscale shard and check reuse", func() {
 			Expect(ring.Len(), 2)
+
+			wantShard := ring.GetAddr("ringShardOne")
 			ring.SetAddrs(map[string]string{
 				"ringShardOne": ":" + ringShard1Port,
 			})
 			Expect(ring.Len(), 1)
+			gotShard := ring.GetAddr("ringShardOne")
+			Expect(gotShard).To(Equal(wantShard))
 
 			ring.SetAddrs(map[string]string{
 				"ringShardOne": ":" + ringShard1Port,
 				"ringShardTwo": ":" + ringShard2Port,
 			})
-
 			Expect(ring.Len(), 2)
+			gotShard = ring.GetAddr("ringShardOne")
+			Expect(gotShard).To(Equal(wantShard))
+
 		})
 
 		It("uses 3 shards after setting it to 3 shards", func() {
@@ -137,18 +143,39 @@ var _ = Describe("Redis Ring", func() {
 			ringShard3, err = startRedis(ringShard3Port)
 			Expect(err).NotTo(HaveOccurred())
 
+			shardName1 := "ringShardOne"
+			shardAddr1 := ":" + ringShard1Port
+			wantShard1 := ring.GetAddr(shardName1)
+			shardName2 := "ringShardTwo"
+			shardAddr2 := ":" + ringShard2Port
+			wantShard2 := ring.GetAddr(shardName2)
+			shardName3 := "ringShardThree"
+			shardAddr3 := ":" + ringShard3Port
+
 			ring.SetAddrs(map[string]string{
-				"ringShardOne":   ":" + ringShard1Port,
-				"ringShardTwo":   ":" + ringShard2Port,
-				"ringShardThree": ":" + ringShard3Port,
+				shardName1: shardAddr1,
+				shardName2: shardAddr2,
+				shardName3: shardAddr3,
 			})
 			Expect(ring.Len(), 3)
+			gotShard1 := ring.GetAddr(shardName1)
+			gotShard2 := ring.GetAddr(shardName2)
+			gotShard3 := ring.GetAddr(shardName3)
+			Expect(gotShard1).To(Equal(wantShard1))
+			Expect(gotShard2).To(Equal(wantShard2))
+			Expect(gotShard3).ToNot(BeNil())
 
 			ring.SetAddrs(map[string]string{
-				"ringShardOne": ":" + ringShard1Port,
-				"ringShardTwo": ":" + ringShard2Port,
+				shardName1: shardAddr1,
+				shardName2: shardAddr2,
 			})
 			Expect(ring.Len(), 2)
+			gotShard1 = ring.GetAddr(shardName1)
+			gotShard2 = ring.GetAddr(shardName2)
+			gotShard3 = ring.GetAddr(shardName3)
+			Expect(gotShard1).To(Equal(wantShard1))
+			Expect(gotShard2).To(Equal(wantShard2))
+			Expect(gotShard3).To(BeNil())
 		})
 
 	})