redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-29 17:41:15 +03:00
Code Activity

cluster: don't reset command when there no attempts left.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2015-05-10 16:01:38 +03:00
parent 2507be6cd2
commit 7f1eb05ba8
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cluster_test.go
View File

@ -40,14 +40,16 @@ func (s *clusterScenario) slaves() []*redis.Client {
return result
}
func (s *clusterScenario) clusterClient() *redis.ClusterClient {
func (s *clusterScenario) clusterClient(opt *redis.ClusterOptions) *redis.ClusterClient {
addrs := make([]string, len(s.ports))
for i, port := range s.ports {
addrs[i] = net.JoinHostPort("127.0.0.1", port)
}
return redis.NewClusterClient(&redis.ClusterOptions{
Addrs: addrs,
})
if opt == nil {
opt = &redis.ClusterOptions{}
}
opt.Addrs = addrs
return redis.NewClusterClient(opt)
}
func startCluster(scenario *clusterScenario) error {
@ -228,7 +230,7 @@ var _ = Describe("Cluster", func() {
var client *redis.ClusterClient
BeforeEach(func() {
client = scenario.clusterClient()
client = scenario.clusterClient(nil)
})
AfterEach(func() {
@ -301,6 +303,18 @@ var _ = Describe("Cluster", func() {
Expect(cmds[27].(*redis.DurationCmd).Val()).To(BeNumerically("~", 7*time.Hour, time.Second))
})
It("should return error when there are no attempts left", func() {
client = scenario.clusterClient(&redis.ClusterOptions{
MaxRedirects: -1,
})
slot := redis.HashSlot("A")
Expect(client.SwapSlot(slot)).To(Equal([]string{"127.0.0.1:8224", "127.0.0.1:8221"}))
err := client.Get("A").Err()
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("MOVED"))
})
})
})
@ -317,7 +331,7 @@ func BenchmarkRedisClusterPing(b *testing.B) {
b.Fatal(err)
}
defer stopCluster(scenario)
client := scenario.clusterClient()
client := scenario.clusterClient(nil)
defer client.Close()
b.ResetTimer()