Skip to content

Commit

Permalink
config: cleanup default sentinel.conf, disable mymaster
Browse files Browse the repository at this point in the history
  • Loading branch information
spinlock committed Jun 5, 2017
1 parent 48e12b1 commit 01f72db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ codis-server:
@cp -f extern/redis-3.2.8/src/redis-cli bin/
@cp -f extern/redis-3.2.8/redis.conf config/
@cp -f extern/redis-3.2.8/sentinel.conf config/
@sed -e "s/^sentinel/# sentinel/g" config/sentinel.conf -i

clean-gotest:
@rm -rf ./pkg/topom/gotest.tmp
Expand Down
8 changes: 4 additions & 4 deletions config/sentinel.conf
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dir /tmp
#
# Note: master name should not include special characters or spaces.
# The valid charset is A-z 0-9 and the three characters ".-_".
sentinel monitor mymaster 127.0.0.1 6379 2
# sentinel monitor mymaster 127.0.0.1 6379 2

# sentinel auth-pass <master-name> <password>
#
Expand Down Expand Up @@ -95,15 +95,15 @@ sentinel monitor mymaster 127.0.0.1 6379 2
# Down).
#
# Default is 30 seconds.
sentinel down-after-milliseconds mymaster 30000
# sentinel down-after-milliseconds mymaster 30000

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

# sentinel failover-timeout <master-name> <milliseconds>
#
Expand All @@ -128,7 +128,7 @@ sentinel parallel-syncs mymaster 1
# the exact parallel-syncs progression as specified.
#
# Default is 3 minutes.
sentinel failover-timeout mymaster 180000
# sentinel failover-timeout mymaster 180000

# SCRIPTS EXECUTION
#
Expand Down

0 comments on commit 01f72db

Please sign in to comment.