Skip to content

Commit 9208147

Browse files
committed
WIP
1 parent 4d5265b commit 9208147

File tree

5 files changed

+44
-25
lines changed

5 files changed

+44
-25
lines changed

config/sentinel/docker-compose.yaml

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
redis-master:
2-
image: redis
3-
ports:
4-
- "6379:6379"
5-
redis-slave:
6-
image: redis
7-
command: redis-server --slaveof redis-master 6379
8-
ports:
9-
- "6379"
10-
links:
11-
- redis-master
12-
redis-sentinel:
13-
image: redis
14-
command: redis-sentinel /etc/redis/sentinel.conf
15-
volumes:
16-
- ./sentinel.conf:/etc/redis/sentinel.conf
17-
ports:
18-
- "26379"
19-
links:
20-
- redis-master
21-
- redis-slave
1+
services:
2+
redis-master:
3+
image: redis
4+
redis-slave:
5+
image: redis
6+
command: redis-server --slaveof redis-master 6379
7+
depends_on:
8+
- redis-master
9+
redis-sentinel:
10+
image: redis
11+
command: redis-sentinel /etc/redis/sentinel.conf
12+
volumes:
13+
- ./sentinel.conf:/etc/redis/sentinel.conf
14+
depends_on:
15+
- redis-master
16+
- redis-slave

config/sentinel/environment.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
MASTER_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}' redis-cluster_master_1)
3+
SLAVE_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}' redis-cluster_slave_1)
4+
SENTINEL_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}' redis-cluster_sentinel_1)

config/sentinel/readme.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Sentinel Testing
2+
3+
To test sentinels, you need to set up master, slave and sentinel instances.
4+
5+
## Setup
6+
7+
``` bash
8+
$ docker-compose -f config/sentinel/docker-compose.yaml up -d
9+
[+] Running 3/3
10+
✔ Container sentinel-redis-master-1 Running 0.0s
11+
✔ Container sentinel-redis-slave-1 Running 0.0s
12+
✔ Container sentinel-redis-sentinel-1 Started 0.2s
13+
```
14+
15+
## Test
16+
17+
``` bash
18+
$ ASYNC_REDIS_MASTER=redis://redis-master:6379 ASYNC_REDIS_SLAVE=redis://redis-slave:6379 ASYNC_REDIS_SENTINEL=redis://redis-sentinel:26379 bundle exec sus
19+
```

config/sentinel/sentinel.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
port 26379
2+
sentinel resolve-hostnames yes
23
sentinel monitor mymaster redis-master 6379 1
34
sentinel down-after-milliseconds mymaster 1000
45
sentinel failover-timeout mymaster 1000

test/async/redis/sentinel_client.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
it "should resolve master address" do
2727
unless master_host and slave_host and sentinel_host
2828
skip("No sentinel host provided.")
29-
30-
client.set("key", "value")
31-
32-
expect(slave_client.get("key")).to be == "value"
3329
end
30+
31+
client.set("key", "value")
32+
33+
expect(slave_client.get("key")).to be == "value"
3434
end
3535
end

0 commit comments

Comments
 (0)