Skip to content

Commit 01f72db

Browse files
committed
config: cleanup default sentinel.conf, disable mymaster
1 parent 48e12b1 commit 01f72db

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ codis-server:
3232
@cp -f extern/redis-3.2.8/src/redis-cli bin/
3333
@cp -f extern/redis-3.2.8/redis.conf config/
3434
@cp -f extern/redis-3.2.8/sentinel.conf config/
35+
@sed -e "s/^sentinel/# sentinel/g" config/sentinel.conf -i
3536

3637
clean-gotest:
3738
@rm -rf ./pkg/topom/gotest.tmp

config/sentinel.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dir /tmp
6666
#
6767
# Note: master name should not include special characters or spaces.
6868
# The valid charset is A-z 0-9 and the three characters ".-_".
69-
sentinel monitor mymaster 127.0.0.1 6379 2
69+
# sentinel monitor mymaster 127.0.0.1 6379 2
7070

7171
# sentinel auth-pass <master-name> <password>
7272
#
@@ -95,15 +95,15 @@ sentinel monitor mymaster 127.0.0.1 6379 2
9595
# Down).
9696
#
9797
# Default is 30 seconds.
98-
sentinel down-after-milliseconds mymaster 30000
98+
# sentinel down-after-milliseconds mymaster 30000
9999

100100
# sentinel parallel-syncs <master-name> <numslaves>
101101
#
102102
# How many slaves we can reconfigure to point to the new slave simultaneously
103103
# during the failover. Use a low number if you use the slaves to serve query
104104
# to avoid that all the slaves will be unreachable at about the same
105105
# time while performing the synchronization with the master.
106-
sentinel parallel-syncs mymaster 1
106+
# sentinel parallel-syncs mymaster 1
107107

108108
# sentinel failover-timeout <master-name> <milliseconds>
109109
#
@@ -128,7 +128,7 @@ sentinel parallel-syncs mymaster 1
128128
# the exact parallel-syncs progression as specified.
129129
#
130130
# Default is 3 minutes.
131-
sentinel failover-timeout mymaster 180000
131+
# sentinel failover-timeout mymaster 180000
132132

133133
# SCRIPTS EXECUTION
134134
#

0 commit comments

Comments
 (0)