Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
45c60a90
Commit
45c60a90
authored
Nov 30, 2013
by
Yubao Liu
Committed by
antirez
Dec 12, 2013
Browse files
fix typo in redis.conf and sentinel.conf
parent
5e75e681
Changes
2
Show whitespace changes
Inline
Side-by-side
redis.conf
View file @
45c60a90
...
@@ -633,7 +633,7 @@ activerehashing yes
...
@@ -633,7 +633,7 @@ activerehashing yes
#
#
# normal -> normal clients
# normal -> normal clients
# slave -> slave clients and MONITOR clients
# slave -> slave clients and MONITOR clients
# pubsub -> clients subcribed to at least one pubsub channel or pattern
# pubsub -> clients sub
s
cribed to at least one pubsub channel or pattern
#
#
# The syntax of every client-output-buffer-limit directive is the following:
# The syntax of every client-output-buffer-limit directive is the following:
#
#
...
...
sentinel.conf
View file @
45c60a90
...
@@ -6,7 +6,7 @@ port 26379
...
@@ -6,7 +6,7 @@ port 26379
# sentinel monitor <master-name> <ip> <redis-port> <quorum>
# sentinel monitor <master-name> <ip> <redis-port> <quorum>
#
#
# Tells Sentinel to monitor this
slave
, and to consider it in O_DOWN
# Tells Sentinel to monitor this
master
, and to consider it in O_DOWN
# (Objectively Down) state only if at least <quorum> sentinels agree.
# (Objectively Down) state only if at least <quorum> sentinels agree.
#
#
# Note that whatever is the ODOWN quorum, a Sentinel will require to
# Note that whatever is the ODOWN quorum, a Sentinel will require to
...
@@ -63,7 +63,7 @@ sentinel parallel-syncs mymaster 1
...
@@ -63,7 +63,7 @@ sentinel parallel-syncs mymaster 1
# times the failover timeout.
# times the failover timeout.
#
#
# - The time needed for a slave replicating to a wrong master according
# - The time needed for a slave replicating to a wrong master according
# to a Sentinel curr
n
et configuration, to be forced to replicate
# to a Sentinel curre
n
t configuration, to be forced to replicate
# with the right master, is exactly the failover timeout (counting since
# with the right master, is exactly the failover timeout (counting since
# the moment a Sentinel detected the misconfiguration).
# the moment a Sentinel detected the misconfiguration).
#
#
...
@@ -102,7 +102,7 @@ sentinel failover-timeout mymaster 180000
...
@@ -102,7 +102,7 @@ sentinel failover-timeout mymaster 180000
#
#
# sentinel notification-script <master-name> <script-path>
# sentinel notification-script <master-name> <script-path>
#
#
# Call the specified notification script for any senti
e
nl event that is
# Call the specified notification script for any sentin
e
l event that is
# generated in the WARNING level (for instance -sdown, -odown, and so forth).
# generated in the WARNING level (for instance -sdown, -odown, and so forth).
# This script should notify the system administrator via email, SMS, or any
# This script should notify the system administrator via email, SMS, or any
# other messaging system, that there is something wrong with the monitored
# other messaging system, that there is something wrong with the monitored
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment