2014-04-24 13:08:22 +04:00
# Multi-instance test framework.
# This is used in order to test Sentinel and Redis Cluster, and provides
# basic capabilities for spawning and handling N parallel Redis / Sentinel
# instances.
#
# Copyright (C) 2014 Salvatore Sanfilippo antirez@gmail.com
2014-07-31 22:25:48 +04:00
# This software is released under the BSD License. See the COPYING file for
2014-02-17 20:37:56 +04:00
# more information.
package require Tcl 8.5
set tcl_precision 17
2014-04-24 13:08:22 +04:00
source ../ support/ redis.tcl
source ../ support/ util.tcl
source ../ support/ server.tcl
source ../ support/ test.tcl
2014-02-17 20:37:56 +04:00
set : : verbose 0
2015-01-10 01:43:48 +03:00
set : : valgrind 0
2019-09-12 10:56:54 +03:00
set : : tls 0
2014-02-23 20:57:53 +04:00
set : : pause_on_error 0
2020-09-06 11:11:49 +03:00
set : : dont_clean 0
2014-03-04 15:05:49 +04:00
set : : simulate_error 0
2015-03-30 15:29:01 +03:00
set : : failed 0
2014-02-17 20:37:56 +04:00
set : : sentinel_instances { }
set : : redis_instances { }
2021-01-17 16:48:48 +03:00
set : : global_config { }
2014-02-17 20:37:56 +04:00
set : : sentinel_base_port 20000
set : : redis_base_port 30000
2020-05-26 11:00:48 +03:00
set : : redis_port_count 1024
Add hostname support in Sentinel. (#8282)
This is both a bugfix and an enhancement.
Internally, Sentinel relies entirely on IP addresses to identify
instances. When configured with a new master, it also requires users to
specify and IP and not hostname.
However, replicas may use the replica-announce-ip configuration to
announce a hostname. When that happens, Sentinel fails to match the
announced hostname with the expected IP and considers that a different
instance, triggering reconfiguration, etc.
Another use case is where TLS is used and clients are expected to match
the hostname to connect to with the certificate's SAN attribute. To
properly implement this configuration, it is necessary for Sentinel to
redirect clients to a hostname rather than an IP address.
The new 'resolve-hostnames' configuration parameter determines if
Sentinel is willing to accept hostnames. It is set by default to no,
which maintains backwards compatibility and avoids unexpected DNS
resolution delays on systems with DNS configuration issues.
Internally, Sentinel continues to identify instances by their resolved
IP address and will also report the IP by default. The new
'announce-hostnames' parameter determines if Sentinel should prefer to
announce a hostname, when available, rather than an IP address. This
applies to addresses returned to clients, as well as their
representation in the configuration file, REPLICAOF configuration
commands, etc.
This commit also introduces SENTINEL CONFIG GET and SENTINEL CONFIG SET
which can be used to introspect or configure global Sentinel
configuration that was previously was only possible by directly
accessing the configuration file and possibly restarting the instance.
Co-authored-by: myl1024 <myl92916@qq.com>
Co-authored-by: sundb <sundbcn@gmail.com>
2021-01-28 13:09:11 +03:00
set : : host " 1 2 7 . 0 . 0 . 1 "
2021-02-08 18:02:46 +03:00
set : : leaked_fds_file [ file normalize " t m p / l e a k e d _ f d s . t x t " ]
2014-02-17 20:37:56 +04:00
set : : pids { } ; # We kill everything at exit
set : : dirs { } ; # We remove all the temp dirs at exit
2014-02-20 19:28:38 +04:00
set : : run_matching { } ; # If non empty, only tests matching pattern are run.
2014-02-17 20:37:56 +04:00
2014-04-24 13:08:22 +04:00
if { [ catch { cd tmp} ] } {
puts " t m p d i r e c t o r y n o t f o u n d . "
2014-02-17 20:37:56 +04:00
puts " P l e a s e r u n t h i s t e s t f r o m t h e R e d i s s o u r c e r o o t . "
exit 1
}
2015-01-22 20:57:45 +03:00
# Execute the specified instance of the server specified by 'type', using
# the provided configuration file. Returns the PID of the process.
2020-09-06 11:11:49 +03:00
proc exec_instance { type dirname cfgfile} {
2015-01-22 20:57:45 +03:00
if { $type eq " r e d i s " } {
set prgname redis-server
} elseif { $type eq " s e n t i n e l " } {
set prgname redis-sentinel
} else {
error " U n k n o w n i n s t a n c e t y p e . "
}
2020-09-06 11:11:49 +03:00
set errfile [ file join $dirname err.txt]
2015-01-22 20:57:45 +03:00
if { $::valgrind } {
2020-09-06 11:11:49 +03:00
set pid [ exec valgrind - - track-origins= yes - - suppressions= ../ ../ ../ src/ valgrind.sup - - show-reachable= no - - show-possibly-lost= no - - leak-check= full ../ ../ ../ src/ $ { prgname } $cfgfile 2 >> $errfile & ]
2015-01-22 20:57:45 +03:00
} else {
2020-09-07 16:26:11 +03:00
set pid [ exec ../ ../ ../ src/ $ { prgname } $cfgfile 2 >> $errfile & ]
2015-01-22 20:57:45 +03:00
}
return $pid
}
2014-02-17 20:37:56 +04:00
# Spawn a redis or sentinel instance, depending on 'type'.
Sentinel: Fix Config Dependency and Rewrite Sequence (#8271)
This commit fixes a well known and an annoying issue in Sentinel mode.
Cause of this issue:
Currently, Redis rewrite process works well in server mode, however in sentinel mode,
the sentinel config has variant semantics for different configurations, in example configuration
https://github.com/redis/redis/blob/unstable/sentinel.conf, we put comments on these.
However the rewrite process only treat the sentinel config as a single option. During rewrite
process, it will mess up with the lines and comments.
Approaches:
In order to solve this issue, we need to differentiate different subconfig options in sentinel separately,
for example, sentinel monitor <master-name> <ip> <redis-port> <quorum>
we can treat it as sentinel monitor option, instead of the sentinel option.
This commit also fixes the dependency issue when putting configurations in sentinel.conf.
For example before this commit,we must put
`sentinel monitor <master-name> <ip> <redis-port> <quorum>` before
`sentinel auth-pass <master-name> <password>` for a single master,
otherwise the server cannot start and will return error. This commit fixes this issue, as long as
the monitoring master was configured, no matter the sequence is, the sentinel can start and run properly.
2021-01-26 10:31:54 +03:00
proc spawn_instance { type base_port count { conf { } } { base_conf_file " " } } {
2014-02-17 20:37:56 +04:00
for { set j 0 } { $j < $count } { incr j} {
2020-05-26 11:00:48 +03:00
set port [ find_available_port $base_port $::redis_port_count ]
2021-03-30 23:11:32 +03:00
# plaintext port (only used for TLS cluster)
set pport 0
2014-04-24 12:50:51 +04:00
# Create a directory for this instance.
2014-02-17 20:37:56 +04:00
set dirname " $ { t y p e } _ $ { j } "
lappend : : dirs $dirname
catch { exec rm - rf $dirname }
file mkdir $dirname
2014-04-24 12:50:51 +04:00
# Write the instance config file.
2014-02-17 20:37:56 +04:00
set cfgfile [ file join $dirname $type.conf ]
Sentinel: Fix Config Dependency and Rewrite Sequence (#8271)
This commit fixes a well known and an annoying issue in Sentinel mode.
Cause of this issue:
Currently, Redis rewrite process works well in server mode, however in sentinel mode,
the sentinel config has variant semantics for different configurations, in example configuration
https://github.com/redis/redis/blob/unstable/sentinel.conf, we put comments on these.
However the rewrite process only treat the sentinel config as a single option. During rewrite
process, it will mess up with the lines and comments.
Approaches:
In order to solve this issue, we need to differentiate different subconfig options in sentinel separately,
for example, sentinel monitor <master-name> <ip> <redis-port> <quorum>
we can treat it as sentinel monitor option, instead of the sentinel option.
This commit also fixes the dependency issue when putting configurations in sentinel.conf.
For example before this commit,we must put
`sentinel monitor <master-name> <ip> <redis-port> <quorum>` before
`sentinel auth-pass <master-name> <password>` for a single master,
otherwise the server cannot start and will return error. This commit fixes this issue, as long as
the monitoring master was configured, no matter the sequence is, the sentinel can start and run properly.
2021-01-26 10:31:54 +03:00
if { $base_conf_file ne " " } {
file copy - - $base_conf_file $cfgfile
set cfg [ open $cfgfile a+ ]
} else {
set cfg [ open $cfgfile w]
}
2019-09-12 10:56:54 +03:00
if { $::tls } {
puts $cfg " t l s - p o r t $ p o r t "
puts $cfg " t l s - r e p l i c a t i o n y e s "
puts $cfg " t l s - c l u s t e r y e s "
2021-03-30 23:11:32 +03:00
# plaintext port, only used by plaintext clients in a TLS cluster
set pport [ find_available_port $base_port $::redis_port_count ]
puts $cfg " p o r t $ p p o r t "
2020-12-11 19:31:40 +03:00
puts $cfg [ format " t l s - c e r t - f i l e % s / . . / . . / t l s / s e r v e r . c r t " [ pwd ] ]
puts $cfg [ format " t l s - k e y - f i l e % s / . . / . . / t l s / s e r v e r . k e y " [ pwd ] ]
puts $cfg [ format " t l s - c l i e n t - c e r t - f i l e % s / . . / . . / t l s / c l i e n t . c r t " [ pwd ] ]
puts $cfg [ format " t l s - c l i e n t - k e y - f i l e % s / . . / . . / t l s / c l i e n t . k e y " [ pwd ] ]
2019-09-12 10:56:54 +03:00
puts $cfg [ format " t l s - d h - p a r a m s - f i l e % s / . . / . . / t l s / r e d i s . d h " [ pwd ] ]
puts $cfg [ format " t l s - c a - c e r t - f i l e % s / . . / . . / t l s / c a . c r t " [ pwd ] ]
puts $cfg " l o g l e v e l d e b u g "
} else {
puts $cfg " p o r t $ p o r t "
}
2014-02-17 20:37:56 +04:00
puts $cfg " d i r . / $ d i r n a m e "
puts $cfg " l o g f i l e l o g . t x t "
2014-04-24 12:50:51 +04:00
# Add additional config files
foreach directive $conf {
puts $cfg $directive
}
2021-01-17 16:48:48 +03:00
dict for { name val} $::global_config {
puts $cfg " $ n a m e $ v a l "
}
2014-02-17 20:37:56 +04:00
close $cfg
# Finally exec it and remember the pid for later cleanup.
2020-08-09 06:08:00 +03:00
set retry 100
while { $retry } {
2020-09-06 11:11:49 +03:00
set pid [ exec_instance $type $dirname $cfgfile ]
2014-02-17 20:37:56 +04:00
2020-08-09 06:08:00 +03:00
# Check availability
if { [ server_is_up 127.0 .0.1 $port 100 ] == 0 } {
puts " S t a r t i n g $ t y p e # $ j a t p o r t $ p o r t f a i l e d , t r y a n o t h e r "
incr retry - 1
set port [ find_available_port $base_port $::redis_port_count ]
set cfg [ open $cfgfile a+ ]
if { $::tls } {
puts $cfg " t l s - p o r t $ p o r t "
2021-03-30 23:11:32 +03:00
set pport [ find_available_port $base_port $::redis_port_count ]
puts $cfg " p o r t $ p p o r t "
2020-08-09 06:08:00 +03:00
} else {
puts $cfg " p o r t $ p o r t "
}
close $cfg
} else {
puts " S t a r t i n g $ t y p e # $ j a t p o r t $ p o r t "
lappend : : pids $pid
break
}
}
# Check availability finally
Add hostname support in Sentinel. (#8282)
This is both a bugfix and an enhancement.
Internally, Sentinel relies entirely on IP addresses to identify
instances. When configured with a new master, it also requires users to
specify and IP and not hostname.
However, replicas may use the replica-announce-ip configuration to
announce a hostname. When that happens, Sentinel fails to match the
announced hostname with the expected IP and considers that a different
instance, triggering reconfiguration, etc.
Another use case is where TLS is used and clients are expected to match
the hostname to connect to with the certificate's SAN attribute. To
properly implement this configuration, it is necessary for Sentinel to
redirect clients to a hostname rather than an IP address.
The new 'resolve-hostnames' configuration parameter determines if
Sentinel is willing to accept hostnames. It is set by default to no,
which maintains backwards compatibility and avoids unexpected DNS
resolution delays on systems with DNS configuration issues.
Internally, Sentinel continues to identify instances by their resolved
IP address and will also report the IP by default. The new
'announce-hostnames' parameter determines if Sentinel should prefer to
announce a hostname, when available, rather than an IP address. This
applies to addresses returned to clients, as well as their
representation in the configuration file, REPLICAOF configuration
commands, etc.
This commit also introduces SENTINEL CONFIG GET and SENTINEL CONFIG SET
which can be used to introspect or configure global Sentinel
configuration that was previously was only possible by directly
accessing the configuration file and possibly restarting the instance.
Co-authored-by: myl1024 <myl92916@qq.com>
Co-authored-by: sundb <sundbcn@gmail.com>
2021-01-28 13:09:11 +03:00
if { [ server_is_up $::host $port 100 ] == 0 } {
2020-08-20 08:59:02 +03:00
set logfile [ file join $dirname log.txt]
puts [ exec tail $logfile ]
abort_sentinel_test " P r o b l e m s s t a r t i n g $ t y p e # $ j : p i n g t i m e o u t , m a y b e s e r v e r s t a r t f a i l e d , c h e c k $ l o g f i l e "
2014-02-17 20:37:56 +04:00
}
# Push the instance into the right list
Add hostname support in Sentinel. (#8282)
This is both a bugfix and an enhancement.
Internally, Sentinel relies entirely on IP addresses to identify
instances. When configured with a new master, it also requires users to
specify and IP and not hostname.
However, replicas may use the replica-announce-ip configuration to
announce a hostname. When that happens, Sentinel fails to match the
announced hostname with the expected IP and considers that a different
instance, triggering reconfiguration, etc.
Another use case is where TLS is used and clients are expected to match
the hostname to connect to with the certificate's SAN attribute. To
properly implement this configuration, it is necessary for Sentinel to
redirect clients to a hostname rather than an IP address.
The new 'resolve-hostnames' configuration parameter determines if
Sentinel is willing to accept hostnames. It is set by default to no,
which maintains backwards compatibility and avoids unexpected DNS
resolution delays on systems with DNS configuration issues.
Internally, Sentinel continues to identify instances by their resolved
IP address and will also report the IP by default. The new
'announce-hostnames' parameter determines if Sentinel should prefer to
announce a hostname, when available, rather than an IP address. This
applies to addresses returned to clients, as well as their
representation in the configuration file, REPLICAOF configuration
commands, etc.
This commit also introduces SENTINEL CONFIG GET and SENTINEL CONFIG SET
which can be used to introspect or configure global Sentinel
configuration that was previously was only possible by directly
accessing the configuration file and possibly restarting the instance.
Co-authored-by: myl1024 <myl92916@qq.com>
Co-authored-by: sundb <sundbcn@gmail.com>
2021-01-28 13:09:11 +03:00
set link [ redis $::host $port 0 $::tls ]
2014-06-18 17:54:55 +04:00
$link reconnect 1
2014-02-18 14:04:01 +04:00
lappend : : $ { type } _instances [ list \
2014-02-22 20:26:30 +04:00
pid $pid \
Add hostname support in Sentinel. (#8282)
This is both a bugfix and an enhancement.
Internally, Sentinel relies entirely on IP addresses to identify
instances. When configured with a new master, it also requires users to
specify and IP and not hostname.
However, replicas may use the replica-announce-ip configuration to
announce a hostname. When that happens, Sentinel fails to match the
announced hostname with the expected IP and considers that a different
instance, triggering reconfiguration, etc.
Another use case is where TLS is used and clients are expected to match
the hostname to connect to with the certificate's SAN attribute. To
properly implement this configuration, it is necessary for Sentinel to
redirect clients to a hostname rather than an IP address.
The new 'resolve-hostnames' configuration parameter determines if
Sentinel is willing to accept hostnames. It is set by default to no,
which maintains backwards compatibility and avoids unexpected DNS
resolution delays on systems with DNS configuration issues.
Internally, Sentinel continues to identify instances by their resolved
IP address and will also report the IP by default. The new
'announce-hostnames' parameter determines if Sentinel should prefer to
announce a hostname, when available, rather than an IP address. This
applies to addresses returned to clients, as well as their
representation in the configuration file, REPLICAOF configuration
commands, etc.
This commit also introduces SENTINEL CONFIG GET and SENTINEL CONFIG SET
which can be used to introspect or configure global Sentinel
configuration that was previously was only possible by directly
accessing the configuration file and possibly restarting the instance.
Co-authored-by: myl1024 <myl92916@qq.com>
Co-authored-by: sundb <sundbcn@gmail.com>
2021-01-28 13:09:11 +03:00
host $::host \
2014-02-17 20:37:56 +04:00
port $port \
2021-03-30 23:11:32 +03:00
plaintext-port $pport \
2014-06-18 17:54:55 +04:00
link $link \
2014-02-17 20:37:56 +04:00
]
}
}
2016-01-15 12:19:28 +03:00
proc log_crashes { } {
set start_pattern { * REDIS BUG REPORT START* }
set logs [ glob * / log.txt]
foreach log $logs {
set fd [ open $log ]
set found 0
while { [ gets $fd line] >= 0 } {
if { [ string match $start_pattern $line ] } {
puts " \n * * * C r a s h r e p o r t f o u n d i n $ l o g * * * "
set found 1
}
2020-09-06 11:11:49 +03:00
if { $found } {
puts $line
incr : : failed
}
}
}
set logs [ glob * / err.txt]
foreach log $logs {
2020-08-14 16:05:34 +03:00
set res [ find_valgrind_errors $log true]
2020-09-06 11:11:49 +03:00
if { $res != " " } {
puts $res
incr : : failed
2016-01-15 12:19:28 +03:00
}
}
}
2020-09-06 11:11:49 +03:00
proc is_alive pid {
if { [ catch { exec ps - p $pid } err] } {
return 0
} else {
return 1
}
}
proc stop_instance pid {
catch { exec kill $pid }
2021-02-25 01:26:16 +03:00
# Node might have been stopped in the test
catch { exec kill - SIGCONT $pid }
2020-09-06 11:11:49 +03:00
if { $::valgrind } {
2021-10-26 08:34:30 +03:00
set max_wait 120000
2020-09-06 11:11:49 +03:00
} else {
set max_wait 10000
}
while { [ is_alive $pid ] } {
incr wait 10
2021-10-26 08:34:30 +03:00
if { $wait == $max_wait } {
puts " F o r c i n g p r o c e s s $ p i d t o c r a s h . . . "
catch { exec kill - SEGV $pid }
} elseif { $wait >= $max_wait * 2 } {
2020-09-06 11:11:49 +03:00
puts " F o r c i n g p r o c e s s $ p i d t o e x i t . . . "
catch { exec kill - KILL $pid }
} elseif { $wait % 1000 == 0 } {
puts " W a i t i n g f o r p r o c e s s $ p i d t o e x i t . . . "
}
after 10
}
}
2014-02-17 20:37:56 +04:00
proc cleanup { } {
puts " C l e a n i n g u p . . . "
foreach pid $::pids {
2020-09-06 11:11:49 +03:00
puts " k i l l i n g s t a l e i n s t a n c e $ p i d "
stop_instance $pid
}
log_crashes
if { $::dont_clean } {
return
2014-02-17 20:37:56 +04:00
}
foreach dir $::dirs {
catch { exec rm - rf $dir }
}
}
proc abort_sentinel_test msg {
2016-01-15 12:19:28 +03:00
incr : : failed
2014-02-17 20:37:56 +04:00
puts " W A R N I N G : A b o r t i n g t h e t e s t . "
puts " > > > > > > > > $ m s g "
2015-01-21 18:18:34 +03:00
if { $::pause_on_error } pause_on_error
2014-02-17 20:37:56 +04:00
cleanup
exit 1
}
2014-02-20 19:28:38 +04:00
proc parse_options { } {
for { set j 0 } { $j < [ llength $::argv ] } { incr j} {
set opt [ lindex $::argv $j ]
set val [ lindex $::argv [ expr $j + 1 ] ]
if { $opt eq " - - s i n g l e " } {
incr j
set : : run_matching " * $ { v a l } * "
2014-02-23 20:57:53 +04:00
} elseif { $opt eq " - - p a u s e - o n - e r r o r " } {
set : : pause_on_error 1
2020-09-06 11:11:49 +03:00
} elseif { $opt eq { --dont-clean } } {
set : : dont_clean 1
2014-03-04 15:05:49 +04:00
} elseif { $opt eq " - - f a i l " } {
set : : simulate_error 1
2015-01-10 01:43:48 +03:00
} elseif { $opt eq { --valgrind } } {
set : : valgrind 1
Add hostname support in Sentinel. (#8282)
This is both a bugfix and an enhancement.
Internally, Sentinel relies entirely on IP addresses to identify
instances. When configured with a new master, it also requires users to
specify and IP and not hostname.
However, replicas may use the replica-announce-ip configuration to
announce a hostname. When that happens, Sentinel fails to match the
announced hostname with the expected IP and considers that a different
instance, triggering reconfiguration, etc.
Another use case is where TLS is used and clients are expected to match
the hostname to connect to with the certificate's SAN attribute. To
properly implement this configuration, it is necessary for Sentinel to
redirect clients to a hostname rather than an IP address.
The new 'resolve-hostnames' configuration parameter determines if
Sentinel is willing to accept hostnames. It is set by default to no,
which maintains backwards compatibility and avoids unexpected DNS
resolution delays on systems with DNS configuration issues.
Internally, Sentinel continues to identify instances by their resolved
IP address and will also report the IP by default. The new
'announce-hostnames' parameter determines if Sentinel should prefer to
announce a hostname, when available, rather than an IP address. This
applies to addresses returned to clients, as well as their
representation in the configuration file, REPLICAOF configuration
commands, etc.
This commit also introduces SENTINEL CONFIG GET and SENTINEL CONFIG SET
which can be used to introspect or configure global Sentinel
configuration that was previously was only possible by directly
accessing the configuration file and possibly restarting the instance.
Co-authored-by: myl1024 <myl92916@qq.com>
Co-authored-by: sundb <sundbcn@gmail.com>
2021-01-28 13:09:11 +03:00
} elseif { $opt eq { --host } } {
incr j
set : : host $ { val }
2019-09-12 10:56:54 +03:00
} elseif { $opt eq { --tls } } {
package require tls 1.6
: : tls : : init \
-cafile " $ : : t l s d i r / c a . c r t " \
2020-12-11 19:31:40 +03:00
-certfile " $ : : t l s d i r / c l i e n t . c r t " \
-keyfile " $ : : t l s d i r / c l i e n t . k e y "
2019-09-12 10:56:54 +03:00
set : : tls 1
2021-01-17 16:48:48 +03:00
} elseif { $opt eq { --config } } {
set val2 [ lindex $::argv [ expr $j + 2 ] ]
dict set : : global_config $val $val2
incr j 2
2014-02-20 19:28:38 +04:00
} elseif { $opt eq " - - h e l p " } {
2014-03-04 14:17:27 +04:00
puts " - - s i n g l e < p a t t e r n > O n l y r u n s t e s t s s p e c i f i e d b y p a t t e r n . "
2020-09-06 11:11:49 +03:00
puts " - - d o n t - c l e a n K e e p l o g f i l e s o n e x i t . "
2014-03-04 14:17:27 +04:00
puts " - - p a u s e - o n - e r r o r P a u s e f o r m a n u a l i n s p e c t i o n o n e r r o r . "
2014-03-04 15:05:49 +04:00
puts " - - f a i l S i m u l a t e a t e s t f a i l u r e . "
2015-12-29 17:27:26 +03:00
puts " - - v a l g r i n d R u n w i t h v a l g r i n d . "
2020-09-15 08:27:42 +03:00
puts " - - t l s R u n t e s t s i n T L S m o d e . "
Add hostname support in Sentinel. (#8282)
This is both a bugfix and an enhancement.
Internally, Sentinel relies entirely on IP addresses to identify
instances. When configured with a new master, it also requires users to
specify and IP and not hostname.
However, replicas may use the replica-announce-ip configuration to
announce a hostname. When that happens, Sentinel fails to match the
announced hostname with the expected IP and considers that a different
instance, triggering reconfiguration, etc.
Another use case is where TLS is used and clients are expected to match
the hostname to connect to with the certificate's SAN attribute. To
properly implement this configuration, it is necessary for Sentinel to
redirect clients to a hostname rather than an IP address.
The new 'resolve-hostnames' configuration parameter determines if
Sentinel is willing to accept hostnames. It is set by default to no,
which maintains backwards compatibility and avoids unexpected DNS
resolution delays on systems with DNS configuration issues.
Internally, Sentinel continues to identify instances by their resolved
IP address and will also report the IP by default. The new
'announce-hostnames' parameter determines if Sentinel should prefer to
announce a hostname, when available, rather than an IP address. This
applies to addresses returned to clients, as well as their
representation in the configuration file, REPLICAOF configuration
commands, etc.
This commit also introduces SENTINEL CONFIG GET and SENTINEL CONFIG SET
which can be used to introspect or configure global Sentinel
configuration that was previously was only possible by directly
accessing the configuration file and possibly restarting the instance.
Co-authored-by: myl1024 <myl92916@qq.com>
Co-authored-by: sundb <sundbcn@gmail.com>
2021-01-28 13:09:11 +03:00
puts " - - h o s t < h o s t > U s e h o s t n a m e i n s t e a d o f 1 2 7 . 0 . 0 . 1 . "
2021-01-17 16:48:48 +03:00
puts " - - c o n f i g < k > < v > E x t r a c o n f i g a r g u m e n t ( s ) . "
2014-03-04 14:17:27 +04:00
puts " - - h e l p S h o w s t h i s h e l p . "
2014-02-20 19:28:38 +04:00
exit 0
} else {
puts " U n k n o w n o p t i o n $ o p t "
exit 1
}
}
}
2014-02-23 20:57:53 +04:00
# If --pause-on-error option was passed at startup this function is called
# on error in order to give the developer a chance to understand more about
# the error condition while the instances are still running.
proc pause_on_error { } {
2014-02-23 21:01:30 +04:00
puts " "
2014-02-23 20:57:53 +04:00
puts [ colorstr yellow " * * * P l e a s e i n s p e c t t h e e r r o r n o w * * * " ]
2014-03-04 18:55:36 +04:00
puts " \n T y p e \" c o n t i n u e \" t o r e s u m e t h e t e s t , \" h e l p \" f o r h e l p s c r e e n . \n "
2014-02-23 21:01:30 +04:00
while 1 {
puts - nonewline " > "
2014-02-23 20:57:53 +04:00
flush stdout
2014-03-04 15:05:49 +04:00
set line [ gets stdin]
set argv [ split $line " " ]
set cmd [ lindex $argv 0 ]
if { $cmd eq { continue } } {
break
2014-06-10 17:19:35 +04:00
} elseif { $cmd eq { show-redis-logs } } {
set count 10
if { [ lindex $argv 1 ] ne { } } { set count [ lindex $argv 1 ] }
foreach_redis_id id {
puts " = = = R E D I S $ i d = = = = "
puts [ exec tail - $count redis_$id / log.txt]
puts " - - - - - - - - - - - - - - - - - - - - - \n "
}
2014-03-04 15:05:49 +04:00
} elseif { $cmd eq { show-sentinel-logs } } {
set count 10
if { [ lindex $argv 1 ] ne { } } { set count [ lindex $argv 1 ] }
foreach_sentinel_id id {
puts " = = = S E N T I N E L $ i d = = = = "
puts [ exec tail - $count sentinel_$id / log.txt]
puts " - - - - - - - - - - - - - - - - - - - - - \n "
}
2014-03-04 18:55:36 +04:00
} elseif { $cmd eq { ls } } {
foreach_redis_id id {
puts - nonewline " R e d i s $ i d "
set errcode [ catch {
set str { }
append str " @ [ R I $ i d t c p _ p o r t ] : "
append str " [ R I $ i d r o l e ] "
if { [ RI $id role] eq { slave } } {
append str " [ R I $ i d m a s t e r _ h o s t ] : [ R I $ i d m a s t e r _ p o r t ] "
}
set str
} retval ]
if { $errcode } {
puts " - - $ r e t v a l "
} else {
puts $retval
}
}
foreach_sentinel_id id {
puts - nonewline " S e n t i n e l $ i d "
set errcode [ catch {
set str { }
append str " @ [ S I $ i d t c p _ p o r t ] : "
append str " [ j o i n [ S $ i d s e n t i n e l g e t - m a s t e r - a d d r - b y - n a m e m y m a s t e r ] ] "
set str
} retval ]
if { $errcode } {
puts " - - $ r e t v a l "
} else {
puts $retval
}
}
} elseif { $cmd eq { help } } {
puts " l s L i s t S e n t i n e l a n d R e d i s i n s t a n c e s . "
puts " s h o w - s e n t i n e l - l o g s \[ N \] S h o w l a t e s t N l i n e s o f l o g s . "
2014-06-10 17:19:35 +04:00
puts " s h o w - r e d i s - l o g s \[ N \] S h o w l a t e s t N l i n e s o f l o g s . "
2014-03-04 18:55:36 +04:00
puts " S < i d > c m d . . . a r g C a l l c o m m a n d i n S e n t i n e l < i d > . "
puts " R < i d > c m d . . . a r g C a l l c o m m a n d i n R e d i s < i d > . "
puts " S I < i d > < f i e l d > S h o w S e n t i n e l < i d > I N F O < f i e l d > . "
Squash merging 125 typo/grammar/comment/doc PRs (#7773)
List of squashed commits or PRs
===============================
commit 66801ea
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Jan 13 00:54:31 2020 -0500
typo fix in acl.c
commit 46f55db
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun Sep 6 18:24:11 2020 +0300
Updates a couple of comments
Specifically:
* RM_AutoMemory completed instead of pointing to docs
* Updated link to custom type doc
commit 61a2aa0
Author: xindoo <xindoo@qq.com>
Date: Tue Sep 1 19:24:59 2020 +0800
Correct errors in code comments
commit a5871d1
Author: yz1509 <pro-756@qq.com>
Date: Tue Sep 1 18:36:06 2020 +0800
fix typos in module.c
commit 41eede7
Author: bookug <bookug@qq.com>
Date: Sat Aug 15 01:11:33 2020 +0800
docs: fix typos in comments
commit c303c84
Author: lazy-snail <ws.niu@outlook.com>
Date: Fri Aug 7 11:15:44 2020 +0800
fix spelling in redis.conf
commit 1eb76bf
Author: zhujian <zhujianxyz@gmail.com>
Date: Thu Aug 6 15:22:10 2020 +0800
add a missing 'n' in comment
commit 1530ec2
Author: Daniel Dai <764122422@qq.com>
Date: Mon Jul 27 00:46:35 2020 -0400
fix spelling in tracking.c
commit e517b31
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:32 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit c300eff
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:23 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit 4c058a8
Author: 陈浩鹏 <chenhaopeng@heytea.com>
Date: Thu Jun 25 19:00:56 2020 +0800
Grammar fix and clarification
commit 5fcaa81
Author: bodong.ybd <bodong.ybd@alibaba-inc.com>
Date: Fri Jun 19 10:09:00 2020 +0800
Fix typos
commit 4caca9a
Author: Pruthvi P <pruthvi@ixigo.com>
Date: Fri May 22 00:33:22 2020 +0530
Fix typo eviciton => eviction
commit b2a25f6
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Sun May 17 12:39:59 2020 -0400
Fix a typo.
commit 12842ae
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun May 3 17:16:59 2020 -0400
fix spelling in redis conf
commit ddba07c
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat May 2 23:25:34 2020 +0100
Correct a "conflicts" spelling error.
commit 8fc7bf2
Author: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
Date: Thu Apr 30 10:25:27 2020 +0900
docs: fix EXPIRE_FAST_CYCLE_DURATION to ACTIVE_EXPIRE_CYCLE_FAST_DURATION
commit 9b2b67a
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Fri Apr 24 11:46:22 2020 -0400
Fix a typo.
commit 0746f10
Author: devilinrust <63737265+devilinrust@users.noreply.github.com>
Date: Thu Apr 16 00:17:53 2020 +0200
Fix typos in server.c
commit 92b588d
Author: benjessop12 <56115861+benjessop12@users.noreply.github.com>
Date: Mon Apr 13 13:43:55 2020 +0100
Fix spelling mistake in lazyfree.c
commit 1da37aa
Merge: 2d4ba28 af347a8
Author: hwware <wen.hui.ware@gmail.com>
Date: Thu Mar 5 22:41:31 2020 -0500
Merge remote-tracking branch 'upstream/unstable' into expiretypofix
commit 2d4ba28
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Mar 2 00:09:40 2020 -0500
fix typo in expire.c
commit 1a746f7
Author: SennoYuki <minakami1yuki@gmail.com>
Date: Thu Feb 27 16:54:32 2020 +0800
fix typo
commit 8599b1a
Author: dongheejeong <donghee950403@gmail.com>
Date: Sun Feb 16 20:31:43 2020 +0000
Fix typo in server.c
commit f38d4e8
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun Feb 2 22:58:38 2020 -0500
fix typo in evict.c
commit fe143fc
Author: Leo Murillo <leonardo.murillo@gmail.com>
Date: Sun Feb 2 01:57:22 2020 -0600
Fix a few typos in redis.conf
commit 1ab4d21
Author: viraja1 <anchan.viraj@gmail.com>
Date: Fri Dec 27 17:15:58 2019 +0530
Fix typo in Latency API docstring
commit ca1f70e
Author: gosth <danxuedexing@qq.com>
Date: Wed Dec 18 15:18:02 2019 +0800
fix typo in sort.c
commit a57c06b
Author: ZYunH <zyunhjob@163.com>
Date: Mon Dec 16 22:28:46 2019 +0800
fix-zset-typo
commit b8c92b5
Author: git-hulk <hulk.website@gmail.com>
Date: Mon Dec 16 15:51:42 2019 +0800
FIX: typo in cluster.c, onformation->information
commit 9dd981c
Author: wujm2007 <jim.wujm@gmail.com>
Date: Mon Dec 16 09:37:52 2019 +0800
Fix typo
commit e132d7a
Author: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com>
Date: Fri Nov 15 00:14:07 2019 +0000
Minor typo change
commit 47f44d5
Author: happynote3966 <01ssrmikururudevice01@gmail.com>
Date: Mon Nov 11 22:08:48 2019 +0900
fix comment typo in redis-cli.c
commit b8bdb0d
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 18:00:17 2019 +0800
Fix a spelling mistake of comments in defragDictBucketCallback
commit 0def46a
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 13:09:27 2019 +0800
fix some spelling mistakes of comments in defrag.c
commit f3596fd
Author: Phil Rajchgot <tophil@outlook.com>
Date: Sun Oct 13 02:02:32 2019 -0400
Typo and grammar fixes
Redis and its documentation are great -- just wanted to submit a few corrections in the spirit of Hacktoberfest. Thanks for all your work on this project. I use it all the time and it works beautifully.
commit 2b928cd
Author: KangZhiDong <worldkzd@gmail.com>
Date: Sun Sep 1 07:03:11 2019 +0800
fix typos
commit 33aea14
Author: Axlgrep <axlgrep@gmail.com>
Date: Tue Aug 27 11:02:18 2019 +0800
Fixed eviction spelling issues
commit e282a80
Author: Simen Flatby <simen@oms.no>
Date: Tue Aug 20 15:25:51 2019 +0200
Update comments to reflect prop name
In the comments the prop is referenced as replica-validity-factor,
but it is really named cluster-replica-validity-factor.
commit 74d1f9a
Author: Jim Green <jimgreen2013@qq.com>
Date: Tue Aug 20 20:00:31 2019 +0800
fix comment error, the code is ok
commit eea1407
Author: Liao Tonglang <liaotonglang@gmail.com>
Date: Fri May 31 10:16:18 2019 +0800
typo fix
fix cna't to can't
commit 0da553c
Author: KAWACHI Takashi <tkawachi@gmail.com>
Date: Wed Jul 17 00:38:16 2019 +0900
Fix typo
commit 7fc8fb6
Author: Michael Prokop <mika@grml.org>
Date: Tue May 28 17:58:42 2019 +0200
Typo fixes
s/familar/familiar/
s/compatiblity/compatibility/
s/ ot / to /
s/itsef/itself/
commit 5f46c9d
Author: zhumoing <34539422+zhumoing@users.noreply.github.com>
Date: Tue May 21 21:16:50 2019 +0800
typo-fixes
typo-fixes
commit 321dfe1
Author: wxisme <850885154@qq.com>
Date: Sat Mar 16 15:10:55 2019 +0800
typo fix
commit b4fb131
Merge: 267e0e6 3df1eb8
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Fri Feb 8 22:55:45 2019 +0200
Merge branch 'unstable' of antirez/redis into unstable
commit 267e0e6
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Wed Jan 30 21:26:04 2019 +0200
Minor typo fix
commit 30544e7
Author: inshal96 <39904558+inshal96@users.noreply.github.com>
Date: Fri Jan 4 16:54:50 2019 +0500
remove an extra 'a' in the comments
commit 337969d
Author: BrotherGao <yangdongheng11@gmail.com>
Date: Sat Dec 29 12:37:29 2018 +0800
fix typo in redis.conf
commit 9f4b121
Merge: 423a030 e504583
Author: BrotherGao <yangdongheng@xiaomi.com>
Date: Sat Dec 29 11:41:12 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 423a030
Merge: 42b02b7 46a51cd
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date: Tue Dec 4 23:56:11 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 42b02b7
Merge: 68c0e6e b8febe6
Author: Dongheng Yang <yangdongheng11@gmail.com>
Date: Sun Oct 28 15:54:23 2018 +0800
Merge pull request #1 from antirez/unstable
update local data
commit 714b589
Author: Christian <crifei93@gmail.com>
Date: Fri Dec 28 01:17:26 2018 +0100
fix typo "resulution"
commit e23259d
Author: garenchan <1412950785@qq.com>
Date: Wed Dec 26 09:58:35 2018 +0800
fix typo: segfauls -> segfault
commit a9359f8
Author: xjp <jianping_xie@aliyun.com>
Date: Tue Dec 18 17:31:44 2018 +0800
Fixed REDISMODULE_H spell bug
commit a12c3e4
Author: jdiaz <jrd.palacios@gmail.com>
Date: Sat Dec 15 23:39:52 2018 -0600
Fixes hyperloglog hash function comment block description
commit 770eb11
Author: 林上耀 <1210tom@163.com>
Date: Sun Nov 25 17:16:10 2018 +0800
fix typo
commit fd97fbb
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri Nov 23 17:14:01 2018 +0100
Correct "unsupported" typo.
commit a85522d
Author: Jungnam Lee <jungnam.lee@oracle.com>
Date: Thu Nov 8 23:01:29 2018 +0900
fix typo in test comments
commit ade8007
Author: Arun Kumar <palerdot@users.noreply.github.com>
Date: Tue Oct 23 16:56:35 2018 +0530
Fixed grammatical typo
Fixed typo for word 'dictionary'
commit 869ee39
Author: Hamid Alaei <hamid.a85@gmail.com>
Date: Sun Aug 12 16:40:02 2018 +0430
fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo
commit f89d158
Author: Mayank Jain <mayankjain255@gmail.com>
Date: Tue Jul 31 23:01:21 2018 +0530
Updated README.md with some spelling corrections.
Made correction in spelling of some misspelled words.
commit 892198e
Author: dsomeshwar <someshwar.dhayalan@gmail.com>
Date: Sat Jul 21 23:23:04 2018 +0530
typo fix
commit 8a4d780
Author: Itamar Haber <itamar@redislabs.com>
Date: Mon Apr 30 02:06:52 2018 +0300
Fixes some typos
commit e3acef6
Author: Noah Rosamilia <ivoahivoah@gmail.com>
Date: Sat Mar 3 23:41:21 2018 -0500
Fix typo in /deps/README.md
commit 04442fb
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:32:42 2018 +0800
Fix typo in readSyncBulkPayload() comment.
commit 9f36880
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:20:37 2018 +0800
replication.c comment: run_id -> replid.
commit f866b4a
Author: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu Feb 22 22:01:56 2018 +0000
fix comment typo in server.c
commit 0ebc69b
Author: 줍 <jubee0124@gmail.com>
Date: Mon Feb 12 16:38:48 2018 +0900
Fix typo in redis.conf
Fix `five behaviors` to `eight behaviors` in [this sentence ](antirez/redis@unstable/redis.conf#L564)
commit b50a620
Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com>
Date: Thu Dec 28 12:07:30 2017 +0000
Fix typo in valgrind.sup
commit 7d8f349
Author: Peter Boughton <peter@sorcerersisle.com>
Date: Mon Nov 27 19:52:19 2017 +0000
Update CONTRIBUTING; refer doc updates to redis-doc repo.
commit 02dec7e
Author: Klauswk <klauswk1@hotmail.com>
Date: Tue Oct 24 16:18:38 2017 -0200
Fix typo in comment
commit e1efbc8
Author: chenshi <baiwfg2@gmail.com>
Date: Tue Oct 3 18:26:30 2017 +0800
Correct two spelling errors of comments
commit 93327d8
Author: spacewander <spacewanderlzx@gmail.com>
Date: Wed Sep 13 16:47:24 2017 +0800
Update the comment for OBJ_ENCODING_EMBSTR_SIZE_LIMIT's value
The value of OBJ_ENCODING_EMBSTR_SIZE_LIMIT is 44 now instead of 39.
commit 63d361f
Author: spacewander <spacewanderlzx@gmail.com>
Date: Tue Sep 12 15:06:42 2017 +0800
Fix <prevlen> related doc in ziplist.c
According to the definition of ZIP_BIG_PREVLEN and other related code,
the guard of single byte <prevlen> should be 254 instead of 255.
commit ebe228d
Author: hanael80 <hanael80@gmail.com>
Date: Tue Aug 15 09:09:40 2017 +0900
Fix typo
commit 6b696e6
Author: Matt Robenolt <matt@ydekproductions.com>
Date: Mon Aug 14 14:50:47 2017 -0700
Fix typo in LATENCY DOCTOR output
commit a2ec6ae
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 15 14:15:16 2017 +0800
Fix a typo: form => from
commit 3ab7699
Author: caosiyang <caosiyang@qiyi.com>
Date: Thu Aug 10 18:40:33 2017 +0800
Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream()
commit 72d43ef
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 8 15:57:25 2017 +0800
fix a typo: servewr => server
commit 707c958
Author: Bo Cai <charpty@gmail.com>
Date: Wed Jul 26 21:49:42 2017 +0800
redis-cli.c typo: conut -> count.
Signed-off-by: Bo Cai <charpty@gmail.com>
commit b9385b2
Author: JackDrogon <jack.xsuperman@gmail.com>
Date: Fri Jun 30 14:22:31 2017 +0800
Fix some spell problems
commit 20d9230
Author: akosel <aaronjkosel@gmail.com>
Date: Sun Jun 4 19:35:13 2017 -0500
Fix typo
commit b167bfc
Author: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com>
Date: Mon May 22 21:32:27 2017 +0100
Fix #4008 small typo in comment
commit 2b78ac8
Author: Jake Clarkson <jacobwclarkson@gmail.com>
Date: Wed Apr 26 15:49:50 2017 +0100
Correct typo in tests/unit/hyperloglog.tcl
commit b0f1cdb
Author: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed Apr 19 14:25:18 2017 -0700
Fix typo
commit a90b0f9
Author: charsyam <charsyam@naver.com>
Date: Thu Mar 16 18:19:53 2017 +0900
fix typos
fix typos
fix typos
commit 8430a79
Author: Richard Hart <richardhart92@gmail.com>
Date: Mon Mar 13 22:17:41 2017 -0400
Fixed log message typo in listenToPort.
commit 481a1c2
Author: Vinod Kumar <kumar003vinod@gmail.com>
Date: Sun Jan 15 23:04:51 2017 +0530
src/db.c: Correct "save" -> "safe" typo
commit 586b4d3
Author: wangshaonan <wshn13@gmail.com>
Date: Wed Dec 21 20:28:27 2016 +0800
Fix typo they->the in helloworld.c
commit c1c4b5e
Author: Jenner <hypxm@qq.com>
Date: Mon Dec 19 16:39:46 2016 +0800
typo error
commit 1ee1a3f
Author: tielei <43289893@qq.com>
Date: Mon Jul 18 13:52:25 2016 +0800
fix some comments
commit 11a41fb
Author: Otto Kekäläinen <otto@seravo.fi>
Date: Sun Jul 3 10:23:55 2016 +0100
Fix spelling in documentation and comments
commit 5fb5d82
Author: francischan <f1ancis621@gmail.com>
Date: Tue Jun 28 00:19:33 2016 +0800
Fix outdated comments about redis.c file.
It should now refer to server.c file.
commit 6b254bc
Author: lmatt-bit <lmatt123n@gmail.com>
Date: Thu Apr 21 21:45:58 2016 +0800
Refine the comment of dictRehashMilliseconds func
SLAVECONF->REPLCONF in comment - by andyli029
commit ee9869f
Author: clark.kang <charsyam@naver.com>
Date: Tue Mar 22 11:09:51 2016 +0900
fix typos
commit f7b3b11
Author: Harisankar H <harisankarh@gmail.com>
Date: Wed Mar 9 11:49:42 2016 +0530
Typo correction: "faield" --> "failed"
Typo correction: "faield" --> "failed"
commit 3fd40fc
Author: Itamar Haber <itamar@redislabs.com>
Date: Thu Feb 25 10:31:51 2016 +0200
Fixes a typo in comments
commit 621c160
Author: Prayag Verma <prayag.verma@gmail.com>
Date: Mon Feb 1 12:36:20 2016 +0530
Fix typo in Readme.md
Spelling mistakes -
`eviciton` > `eviction`
`familar` > `familiar`
commit d7d07d6
Author: WonCheol Lee <toctoc21c@gmail.com>
Date: Wed Dec 30 15:11:34 2015 +0900
Typo fixed
commit a4dade7
Author: Felix Bünemann <buenemann@louis.info>
Date: Mon Dec 28 11:02:55 2015 +0100
[ci skip] Improve supervised upstart config docs
This mentions that "expect stop" is required for supervised upstart
to work correctly. See http://upstart.ubuntu.com/cookbook/#expect-stop
for an explanation.
commit d9caba9
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:30:03 2015 +1100
README: Remove trailing whitespace
commit 72d42e5
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:32 2015 +1100
README: Fix typo. th => the
commit dd6e957
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:20 2015 +1100
README: Fix typo. familar => familiar
commit 3a12b23
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:28:54 2015 +1100
README: Fix typo. eviciton => eviction
commit 2d1d03b
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:21:45 2015 +1100
README: Fix typo. sever => server
commit 3973b06
Author: Itamar Haber <itamar@garantiadata.com>
Date: Sat Dec 19 17:01:20 2015 +0200
Typo fix
commit 4f2e460
Author: Steve Gao <fu@2token.com>
Date: Fri Dec 4 10:22:05 2015 +0800
Update README - fix typos
commit b21667c
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:48:37 2015 +0800
delete redundancy color judge in sdscatcolor
commit 88894c7
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:14:42 2015 +0800
the example output shoule be HelloWorld
commit 2763470
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 17:41:39 2015 +0800
modify error word keyevente
Signed-off-by: binyan <binbin.yan@nokia.com>
commit 0847b3d
Author: Bruno Martins <bscmartins@gmail.com>
Date: Wed Nov 4 11:37:01 2015 +0000
typo
commit bbb9e9e
Author: dawedawe <dawedawe@gmx.de>
Date: Fri Mar 27 00:46:41 2015 +0100
typo: zimap -> zipmap
commit 5ed297e
Author: Axel Advento <badwolf.bloodseeker.rev@gmail.com>
Date: Tue Mar 3 15:58:29 2015 +0800
Fix 'salve' typos to 'slave'
commit edec9d6
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Wed Jun 12 14:12:47 2019 +0200
Update README.md
Co-Authored-By: Qix <Qix-@users.noreply.github.com>
commit 692a7af
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Tue May 28 14:32:04 2019 +0200
grammar
commit d962b0a
Author: Nick Frost <nickfrostatx@gmail.com>
Date: Wed Jul 20 15:17:12 2016 -0700
Minor grammar fix
commit 24fff01aaccaf5956973ada8c50ceb1462e211c6 (typos)
Author: Chad Miller <chadm@squareup.com>
Date: Tue Sep 8 13:46:11 2020 -0400
Fix faulty comment about operation of unlink()
commit 3cd5c1f3326c52aa552ada7ec797c6bb16452355
Author: Kevin <kevin.xgr@gmail.com>
Date: Wed Nov 20 00:13:50 2019 +0800
Fix typo in server.c.
From a83af59 Mon Sep 17 00:00:00 2001
From: wuwo <wuwo@wacai.com>
Date: Fri, 17 Mar 2017 20:37:45 +0800
Subject: [PATCH] falure to failure
From c961896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E6=87=B6?= <veficos@gmail.com>
Date: Sat, 27 May 2017 15:33:04 +0800
Subject: [PATCH] fix typo
From e600ef2 Mon Sep 17 00:00:00 2001
From: "rui.zou" <rui.zou@yunify.com>
Date: Sat, 30 Sep 2017 12:38:15 +0800
Subject: [PATCH] fix a typo
From c7d07fa Mon Sep 17 00:00:00 2001
From: Alexandre Perrin <alex@kaworu.ch>
Date: Thu, 16 Aug 2018 10:35:31 +0200
Subject: [PATCH] deps README.md typo
From b25cb67 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 10:55:37 +0300
Subject: [PATCH 1/2] fix typos in header
From ad28ca6 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 11:02:36 +0300
Subject: [PATCH 2/2] fix typos
commit 34924cdedd8552466fc22c1168d49236cb7ee915
Author: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sat Apr 4 21:59:15 2015 +0100
Typos fixed
commit fd2a1e7
Author: Jan <jsteemann@users.noreply.github.com>
Date: Sat Oct 27 19:13:01 2018 +0200
Fix typos
Fix typos
commit e14e47c1a234b53b0e103c5f6a1c61481cbcbb02
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:30:07 2019 -0500
Fix multiple misspellings of "following"
commit 79b948ce2dac6b453fe80995abbcaac04c213d5a
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:24:28 2019 -0500
Fix misspelling of create-cluster
commit 1fffde52666dc99ab35efbd31071a4c008cb5a71
Author: Andy Lester <andy@petdance.com>
Date: Wed Jul 31 17:57:56 2019 -0500
Fix typos
commit 204c9ba9651e9e05fd73936b452b9a30be456cfe
Author: Xiaobo Zhu <xiaobo.zhu@shopee.com>
Date: Tue Aug 13 22:19:25 2019 +0800
fix typos
Squashed commit of the following:
commit 1d9aaf8
Author: danmedani <danmedani@gmail.com>
Date: Sun Aug 2 11:40:26 2015 -0700
README typo fix.
Squashed commit of the following:
commit 32bfa7c
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Jul 6 21:15:08 2015 +0200
Fixed grammer
Squashed commit of the following:
commit b24f69c
Author: Sisir Koppaka <sisir.koppaka@gmail.com>
Date: Mon Mar 2 22:38:45 2015 -0500
utils/hashtable/rehashing.c: Fix typos
Squashed commit of the following:
commit 4e04082
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Mar 23 08:22:21 2015 +0000
Small config file documentation improvements
Squashed commit of the following:
commit acb8773
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:52:48 2015 -0700
Typo and grammar fixes in readme
commit 2eb75b6
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:36:18 2015 -0700
fixed redis.conf comment
Squashed commit of the following:
commit a8249a2
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri Dec 11 11:39:52 2015 +0530
Revise correction of typos.
Squashed commit of the following:
commit 3c02028
Author: zhaojun11 <zhaojun11@jd.com>
Date: Wed Jan 17 19:05:28 2018 +0800
Fix typos include two code typos in cluster.c and latency.c
Squashed commit of the following:
commit 9dba47c
Author: q191201771 <191201771@qq.com>
Date: Sat Jan 4 11:31:04 2020 +0800
fix function listCreate comment in adlist.c
Update src/server.c
commit 2c7c2cb536e78dd211b1ac6f7bda00f0f54faaeb
Author: charpty <charpty@gmail.com>
Date: Tue May 1 23:16:59 2018 +0800
server.c typo: modules system dictionary type comment
Signed-off-by: charpty <charpty@gmail.com>
commit a8395323fb63cb59cb3591cb0f0c8edb7c29a680
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun May 6 00:25:18 2018 +0300
Updates test_helper.tcl's help with undocumented options
Specifically:
* Host
* Port
* Client
commit bde6f9ced15755cd6407b4af7d601b030f36d60b
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 15:19:19 2018 +0800
fix comments in deps files
commit 3172474ba991532ab799ee1873439f3402412331
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 14:33:49 2018 +0800
fix some comments
commit 01b6f2b6858b5cf2ce4ad5092d2c746e755f53f0
Author: Thor Juhasz <thor@juhasz.pro>
Date: Sun Nov 18 14:37:41 2018 +0100
Minor fixes to comments
Found some parts a little unclear on a first read, which prompted me to have a better look at the file and fix some minor things I noticed.
Fixing minor typos and grammar. There are no changes to configuration options.
These changes are only meant to help the user better understand the explanations to the various configuration options
2020-09-10 13:43:38 +03:00
puts " R I < i d > < f i e l d > S h o w R e d i s < i d > I N F O < f i e l d > . "
2014-03-04 18:55:36 +04:00
puts " c o n t i n u e R e s u m e t e s t . "
2014-03-04 15:05:49 +04:00
} else {
set errcode [ catch { eval $line } retval]
2014-03-04 18:55:36 +04:00
if { $retval ne { } } { puts " $ r e t v a l " }
2014-03-04 15:05:49 +04:00
}
2014-02-23 20:57:53 +04:00
}
}
2014-02-17 20:37:56 +04:00
# We redefine 'test' as for Sentinel we don't use the server-client
# architecture for the test, everything is sequential.
proc test { descr code} {
2014-03-04 14:17:27 +04:00
set ts [ clock format [ clock seconds] - format % H:% M:% S]
puts - nonewline " $ t s > $ d e s c r : "
2014-02-17 20:37:56 +04:00
flush stdout
if { [ catch { set retval [ uplevel 1 $code ] } error] } {
2015-03-30 15:29:01 +03:00
incr : : failed
2014-02-17 20:37:56 +04:00
if { [ string match " a s s e r t i o n : * " $error ] } {
set msg [ string range $error 10 end]
puts [ colorstr red $msg ]
2014-02-23 20:57:53 +04:00
if { $::pause_on_error } pause_on_error
2014-02-25 11:33:41 +04:00
puts " ( J u m p i n g t o n e x t u n i t a f t e r e r r o r ) "
return - code continue
2014-02-17 20:37:56 +04:00
} else {
# Re-raise, let handler up the stack take care of this.
error $error $::errorInfo
}
} else {
puts [ colorstr green OK]
}
}
2016-01-02 15:14:23 +03:00
# Check memory leaks when running on OSX using the "leaks" utility.
proc check_leaks instance_types {
if { [ string match { * Darwin * } [ exec uname - a] ] } {
puts - nonewline " T e s t i n g f o r m e m o r y l e a k s . . . " ; flush stdout
foreach type $instance_types {
foreach_instance_id [ set : : $ { type } _instances] id {
if { [ instance_is_killed $type $id ] } continue
set pid [ get_instance_attrib $type $id pid]
set output { 0 leaks}
catch { exec leaks $pid } output
if { [ string match { * process does not exist* } $output ] ||
[ string match { * cannot examine* } $output ] } {
# In a few tests we kill the server process.
set output " 0 l e a k s "
} else {
puts - nonewline " $ t y p e / $ p i d "
flush stdout
}
if { ! [ string match { * 0 leaks* } $output ] } {
puts [ colorstr red " = = = M E M O R Y L E A K D E T E C T E D = = = " ]
puts " I n s t a n c e t y p e $ t y p e , I D $ i d : "
puts $output
puts " = = = "
incr : : failed
}
}
}
puts " "
}
}
2015-03-30 15:29:01 +03:00
# Execute all the units inside the 'tests' directory.
2014-02-17 20:37:56 +04:00
proc run_tests { } {
2014-04-24 13:08:22 +04:00
set tests [ lsort [ glob ../ tests/ * ] ]
2014-02-17 20:37:56 +04:00
foreach test $tests {
2021-02-08 18:02:46 +03:00
# Remove leaked_fds file before starting
if { $::leaked_fds_file != " " && [ file exists $::leaked_fds_file ] } {
file delete $::leaked_fds_file
}
2014-02-20 19:28:38 +04:00
if { $::run_matching ne { } && [ string match $::run_matching $test ] == 0 } {
continue
}
2014-02-20 19:57:51 +04:00
if { [ file isdirectory $test ] } continue
2014-02-18 19:31:52 +04:00
puts [ colorstr yellow " T e s t i n g u n i t : [ l i n d e x [ f i l e s p l i t $ t e s t ] e n d ] " ]
2014-02-17 20:37:56 +04:00
source $test
2016-01-02 15:14:23 +03:00
check_leaks { redis sentinel}
2021-02-08 18:02:46 +03:00
# Check if a leaked fds file was created and abort the test.
if { $::leaked_fds_file != " " && [ file exists $::leaked_fds_file ] } {
puts [ colorstr red " E R R O R : S e n t i n e l h a s l e a k e d f d s t o s c r i p t s : " ]
puts [ exec cat $::leaked_fds_file ]
puts " - - - - "
incr : : failed
}
2014-02-17 20:37:56 +04:00
}
}
2015-03-30 15:29:01 +03:00
# Print a message and exists with 0 / 1 according to zero or more failures.
proc end_tests { } {
2021-01-19 23:57:30 +03:00
if { $::failed == 0 } {
2015-03-30 15:29:01 +03:00
puts " G O O D ! N o e r r o r s . "
exit 0
} else {
2017-08-13 08:21:03 +03:00
puts " W A R N I N G $ : : f a i l e d t e s t ( s ) f a i l e d . "
2015-03-30 15:29:01 +03:00
exit 1
}
}
2014-02-18 14:04:01 +04:00
# The "S" command is used to interact with the N-th Sentinel.
# The general form is:
#
# S <sentinel-id> command arg arg arg ...
#
# Example to ping the Sentinel 0 (first instance): S 0 PING
proc S { n args} {
set s [ lindex $::sentinel_instances $n ]
[ dict get $s link] { * } $args
}
2020-09-09 09:35:42 +03:00
# Returns a Redis instance by index.
# Example:
# [Rn 0] info
proc Rn { n } {
return [ dict get [ lindex $::redis_instances $n ] link]
}
2014-02-18 14:04:01 +04:00
# Like R but to chat with Redis instances.
proc R { n args} {
2020-09-09 09:35:42 +03:00
[ Rn $n ] { * } $args
2014-02-18 14:04:01 +04:00
}
2014-02-18 14:38:49 +04:00
proc get_info_field { info field} {
set fl [ string length $field ]
append field :
foreach line [ split $info " \n " ] {
set line [ string trim $line " \r \n " ]
if { [ string range $line 0 $fl ] eq $field } {
return [ string range $line [ expr { $fl + 1 } ] end]
}
}
return { }
}
proc SI { n field} {
get_info_field [ S $n info] $field
}
proc RI { n field} {
get_info_field [ R $n info] $field
}
2021-04-01 09:44:44 +03:00
proc RPort { n } {
if { $::tls } {
return [ lindex [ R $n config get tls-port] 1 ]
} else {
return [ lindex [ R $n config get port] 1 ]
}
}
2014-02-18 14:04:01 +04:00
# Iterate over IDs of sentinel or redis instances.
2014-02-18 19:31:52 +04:00
proc foreach_instance_id { instances idvar code} {
2014-02-18 14:04:01 +04:00
upvar 1 $idvar id
2014-02-18 19:31:52 +04:00
for { set id 0 } { $id < [ llength $instances ] } { incr id} {
set errcode [ catch { uplevel 1 $code } result]
if { $errcode == 1 } {
error $result $::errorInfo $::errorCode
2014-03-03 16:23:32 +04:00
} elseif { $errcode == 4 } {
continue
2014-03-18 18:06:52 +04:00
} elseif { $errcode == 3 } {
break
2014-02-18 19:31:52 +04:00
} elseif { $errcode != 0 } {
return - code $errcode $result
}
2014-02-18 14:04:01 +04:00
}
}
2014-02-18 19:31:52 +04:00
proc foreach_sentinel_id { idvar code} {
set errcode [ catch { uplevel 1 [ list foreach_instance_id $::sentinel_instances $idvar $code ] } result]
return - code $errcode $result
}
2014-02-18 14:04:01 +04:00
proc foreach_redis_id { idvar code} {
2014-02-18 19:31:52 +04:00
set errcode [ catch { uplevel 1 [ list foreach_instance_id $::redis_instances $idvar $code ] } result]
return - code $errcode $result
2014-02-18 14:04:01 +04:00
}
2014-02-18 14:38:49 +04:00
# Get the specific attribute of the specified instance type, id.
proc get_instance_attrib { type id attrib} {
dict get [ lindex [ set : : $ { type } _instances] $id ] $attrib
}
2014-02-22 20:26:30 +04:00
# Set the specific attribute of the specified instance type, id.
proc set_instance_attrib { type id attrib newval} {
set d [ lindex [ set : : $ { type } _instances] $id ]
dict set d $attrib $newval
lset : : $ { type } _instances $id $d
}
2014-02-18 14:38:49 +04:00
# Create a master-slave cluster of the given number of total instances.
# The first instance "0" is the master, all others are configured as
# slaves.
proc create_redis_master_slave_cluster n {
foreach_redis_id id {
if { $id == 0 } {
# Our master.
R $id slaveof no one
2014-02-22 20:26:30 +04:00
R $id flushall
2014-02-18 14:38:49 +04:00
} elseif { $id < $n } {
R $id slaveof [ get_instance_attrib redis 0 host] \
[ get_instance_attrib redis 0 port]
} else {
# Instances not part of the cluster.
R $id slaveof no one
}
}
# Wait for all the slaves to sync.
2014-03-04 14:20:53 +04:00
wait_for_condition 1000 50 {
2014-02-18 14:38:49 +04:00
[ RI 0 connected_slaves] == ( $n-1 )
} else {
fail " U n a b l e t o c r e a t e a m a s t e r - s l a v e s c l u s t e r . "
}
}
2014-02-18 19:31:52 +04:00
proc get_instance_id_by_port { type port} {
foreach_ $ { type } _id id {
if { [ get_instance_attrib $type $id port] == $port } {
return $id
}
}
fail " I n s t a n c e $ t y p e p o r t $ p o r t n o t f o u n d . "
}
2021-10-28 12:16:27 +03:00
# Kill an instance of the specified type/id with SIGTERM.
2014-02-22 20:26:30 +04:00
# This function will mark the instance PID as -1 to remember that this instance
# is no longer running and will remove its PID from the list of pids that
# we kill at cleanup.
#
# The instance can be restarted with restart-instance.
proc kill_instance { type id} {
set pid [ get_instance_attrib $type $id pid]
2015-01-21 18:46:51 +03:00
set port [ get_instance_attrib $type $id port]
2014-02-25 11:23:48 +04:00
if { $pid == -1 } {
error " Y o u t r i e d t o k i l l $ t y p e $ i d t w i c e . "
}
2015-01-21 18:46:51 +03:00
2021-10-28 12:16:27 +03:00
# stop appendonly so that the instance won't refuse to go down
R $id config set appendonly no
2020-09-06 11:11:49 +03:00
stop_instance $pid
2014-02-22 20:26:30 +04:00
set_instance_attrib $type $id pid - 1
set_instance_attrib $type $id link you_tried_to_talk_with_killed_instance
# Remove the PID from the list of pids to kill at exit.
set : : pids [ lsearch - all - inline - not - exact $::pids $pid ]
2015-01-21 18:46:51 +03:00
# Wait for the port it was using to be available again, so that's not
# an issue to start a new server ASAP with the same port.
2020-08-20 08:59:02 +03:00
set retry 100
2015-01-21 18:46:51 +03:00
while { [ incr retry - 1 ] } {
2020-08-20 08:59:02 +03:00
set port_is_free [ catch { set s [ socket 127.0 .0.1 $port ] } ]
2015-01-21 18:46:51 +03:00
if { $port_is_free } break
catch { close $s }
2020-08-20 08:59:02 +03:00
after 100
2015-01-21 18:46:51 +03:00
}
if { $retry == 0 } {
error " P o r t $ p o r t d o e s n o t r e t u r n a v a i l a b l e a f t e r k i l l i n g i n s t a n c e . "
}
2014-02-22 20:26:30 +04:00
}
2014-03-18 17:58:27 +04:00
# Return true of the instance of the specified type/id is killed.
proc instance_is_killed { type id} {
set pid [ get_instance_attrib $type $id pid]
2014-05-19 13:24:05 +04:00
expr { $pid == -1 }
2014-03-18 17:58:27 +04:00
}
2014-02-22 20:26:30 +04:00
# Restart an instance previously killed by kill_instance
proc restart_instance { type id} {
set dirname " $ { t y p e } _ $ { i d } "
set cfgfile [ file join $dirname $type.conf ]
set port [ get_instance_attrib $type $id port]
# Execute the instance with its old setup and append the new pid
# file for cleanup.
2020-09-06 11:11:49 +03:00
set pid [ exec_instance $type $dirname $cfgfile ]
2014-02-25 11:23:48 +04:00
set_instance_attrib $type $id pid $pid
2014-02-22 20:26:30 +04:00
lappend : : pids $pid
# Check that the instance is running
if { [ server_is_up 127.0 .0.1 $port 100 ] == 0 } {
2020-08-20 08:59:02 +03:00
set logfile [ file join $dirname log.txt]
puts [ exec tail $logfile ]
abort_sentinel_test " P r o b l e m s s t a r t i n g $ t y p e # $ i d : p i n g t i m e o u t , m a y b e s e r v e r s t a r t f a i l e d , c h e c k $ l o g f i l e "
2014-02-22 20:26:30 +04:00
}
# Connect with it with a fresh link
2019-09-12 10:56:54 +03:00
set link [ redis 127.0 .0.1 $port 0 $::tls ]
2014-06-18 17:54:55 +04:00
$link reconnect 1
set_instance_attrib $type $id link $link
2016-01-15 18:50:35 +03:00
# Make sure the instance is not loading the dataset when this
# function returns.
while 1 {
catch { [ $link ping ] } retval
if { [ string match { * LOADING * } $retval ] } {
after 100
continue
} else {
break
}
}
2014-02-22 20:26:30 +04:00
}
2020-10-06 21:43:30 +03:00
proc redis_deferring_client { type id} {
set port [ get_instance_attrib $type $id port]
set host [ get_instance_attrib $type $id host]
set client [ redis $host $port 1 $::tls ]
return $client
}
proc redis_client { type id} {
set port [ get_instance_attrib $type $id port]
set host [ get_instance_attrib $type $id host]
set client [ redis $host $port 0 $::tls ]
return $client
}