mirror of
https://github.com/redis/go-redis.git
synced 2025-07-28 06:42:00 +03:00
sentine: don't pass DB and Password to Sentinel client.
This commit is contained in:
@ -7,48 +7,34 @@ import (
|
||||
)
|
||||
|
||||
var _ = Describe("Sentinel", func() {
|
||||
var client *redis.Client
|
||||
|
||||
const masterName = "mymaster"
|
||||
const masterPort = "8123"
|
||||
const sentinelPort = "8124"
|
||||
|
||||
It("should facilitate failover", func() {
|
||||
master, err := startRedis(masterPort)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
defer master.Close()
|
||||
|
||||
sentinel, err := startSentinel(sentinelPort, masterName, masterPort)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
defer sentinel.Close()
|
||||
|
||||
slave1, err := startRedis("8125", "--slaveof", "127.0.0.1", masterPort)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
defer slave1.Close()
|
||||
|
||||
slave2, err := startRedis("8126", "--slaveof", "127.0.0.1", masterPort)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
defer slave2.Close()
|
||||
|
||||
client := redis.NewFailoverClient(&redis.FailoverOptions{
|
||||
MasterName: masterName,
|
||||
BeforeEach(func() {
|
||||
client = redis.NewFailoverClient(&redis.FailoverOptions{
|
||||
MasterName: sentinelName,
|
||||
SentinelAddrs: []string{":" + sentinelPort},
|
||||
})
|
||||
defer client.Close()
|
||||
})
|
||||
|
||||
AfterEach(func() {
|
||||
Expect(client.Close()).NotTo(HaveOccurred())
|
||||
})
|
||||
|
||||
It("should facilitate failover", func() {
|
||||
// Set value on master, verify
|
||||
err = client.Set("foo", "master", 0).Err()
|
||||
err := client.Set("foo", "master", 0).Err()
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
||||
val, err := master.Get("foo").Result()
|
||||
val, err := sentinelMaster.Get("foo").Result()
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(val).To(Equal("master"))
|
||||
|
||||
// Wait until replicated
|
||||
Eventually(func() string {
|
||||
return slave1.Get("foo").Val()
|
||||
return sentinelSlave1.Get("foo").Val()
|
||||
}, "1s", "100ms").Should(Equal("master"))
|
||||
Eventually(func() string {
|
||||
return slave2.Get("foo").Val()
|
||||
return sentinelSlave2.Get("foo").Val()
|
||||
}, "1s", "100ms").Should(Equal("master"))
|
||||
|
||||
// Wait until slaves are picked up by sentinel.
|
||||
@ -57,14 +43,14 @@ var _ = Describe("Sentinel", func() {
|
||||
}, "10s", "100ms").Should(ContainSubstring("slaves=2"))
|
||||
|
||||
// Kill master.
|
||||
master.Shutdown()
|
||||
sentinelMaster.Shutdown()
|
||||
Eventually(func() error {
|
||||
return master.Ping().Err()
|
||||
return sentinelMaster.Ping().Err()
|
||||
}, "5s", "100ms").Should(HaveOccurred())
|
||||
|
||||
// Wait for Redis sentinel to elect new master.
|
||||
Eventually(func() string {
|
||||
return slave1.Info().Val() + slave2.Info().Val()
|
||||
return sentinelSlave1.Info().Val() + sentinelSlave2.Info().Val()
|
||||
}, "30s", "1s").Should(ContainSubstring("role:master"))
|
||||
|
||||
// Check that client picked up new master.
|
||||
@ -73,4 +59,15 @@ var _ = Describe("Sentinel", func() {
|
||||
}, "5s", "100ms").ShouldNot(HaveOccurred())
|
||||
})
|
||||
|
||||
It("supports DB selection", func() {
|
||||
Expect(client.Close()).NotTo(HaveOccurred())
|
||||
|
||||
client = redis.NewFailoverClient(&redis.FailoverOptions{
|
||||
MasterName: sentinelName,
|
||||
SentinelAddrs: []string{":" + sentinelPort},
|
||||
DB: 1,
|
||||
})
|
||||
err := client.Ping().Err()
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
})
|
||||
})
|
||||
|
Reference in New Issue
Block a user