2010-06-02 16:53:22 -04:00
|
|
|
set ::global_overrides {}
|
|
|
|
set ::tags {}
|
2011-07-06 09:22:00 -04:00
|
|
|
set ::valgrind_errors {}
|
2010-06-02 16:53:22 -04:00
|
|
|
|
2011-12-07 05:47:38 -05:00
|
|
|
proc start_server_error {config_file error} {
|
|
|
|
set err {}
|
2018-09-04 06:32:02 -04:00
|
|
|
append err "Can't start the Redis server\n"
|
2011-12-07 05:47:38 -05:00
|
|
|
append err "CONFIGURATION:"
|
|
|
|
append err [exec cat $config_file]
|
|
|
|
append err "\nERROR:"
|
|
|
|
append err [string trim $error]
|
|
|
|
send_data_packet $::test_server_fd err $err
|
2010-05-14 11:31:11 -04:00
|
|
|
}
|
|
|
|
|
2010-05-21 06:00:13 -04:00
|
|
|
proc check_valgrind_errors stderr {
|
2020-08-14 09:05:34 -04:00
|
|
|
set res [find_valgrind_errors $stderr true]
|
2020-09-06 04:11:49 -04:00
|
|
|
if {$res != ""} {
|
|
|
|
send_data_packet $::test_server_fd err "Valgrind error: $res\n"
|
2010-05-21 06:00:13 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-11-11 06:51:33 -05:00
|
|
|
proc check_sanitizer_errors stderr {
|
|
|
|
set res [sanitizer_errors_from_file $stderr]
|
|
|
|
if {$res != ""} {
|
|
|
|
send_data_packet $::test_server_fd err "Sanitizer error: $res\n"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-31 03:44:43 -04:00
|
|
|
proc clean_persistence config {
|
|
|
|
# we may wanna keep the logs for later, but let's clean the persistence
|
|
|
|
# files right away, since they can accumulate and take up a lot of space
|
|
|
|
set config [dict get $config "config"]
|
Implement Multi Part AOF mechanism to avoid AOFRW overheads. (#9788)
Implement Multi-Part AOF mechanism to avoid overheads during AOFRW.
Introducing a folder with multiple AOF files tracked by a manifest file.
The main issues with the the original AOFRW mechanism are:
* buffering of commands that are processed during rewrite (consuming a lot of RAM)
* freezes of the main process when the AOFRW completes to drain the remaining part of the buffer and fsync it.
* double disk IO for the data that arrives during AOFRW (had to be written to both the old and new AOF files)
The main modifications of this PR:
1. Remove the AOF rewrite buffer and related code.
2. Divide the AOF into multiple files, they are classified as two types, one is the the `BASE` type,
it represents the full amount of data (Maybe AOF or RDB format) after each AOFRW, there is only
one `BASE` file at most. The second is `INCR` type, may have more than one. They represent the
incremental commands since the last AOFRW.
3. Use a AOF manifest file to record and manage these AOF files mentioned above.
4. The original configuration of `appendfilename` will be the base part of the new file name, for example:
`appendonly.aof.1.base.rdb` and `appendonly.aof.2.incr.aof`
5. Add manifest-related TCL tests, and modified some existing tests that depend on the `appendfilename`
6. Remove the `aof_rewrite_buffer_length` field in info.
7. Add `aof-disable-auto-gc` configuration. By default we're automatically deleting HISTORY type AOFs.
It also gives users the opportunity to preserve the history AOFs. just for testing use now.
8. Add AOFRW limiting measure. When the AOFRW failures reaches the threshold (3 times now),
we will delay the execution of the next AOFRW by 1 minute. If the next AOFRW also fails, it will be
delayed by 2 minutes. The next is 4, 8, 16, the maximum delay is 60 minutes (1 hour). During the limit
period, we can still use the 'bgrewriteaof' command to execute AOFRW immediately.
9. Support upgrade (load) data from old version redis.
10. Add `appenddirname` configuration, as the directory name of the append only files. All AOF files and
manifest file will be placed in this directory.
11. Only the last AOF file (BASE or INCR) can be truncated. Otherwise redis will exit even if
`aof-load-truncated` is enabled.
Co-authored-by: Oran Agra <oran@redislabs.com>
2022-01-03 12:14:13 -05:00
|
|
|
set dir [dict get $config "dir"]
|
|
|
|
set rdb [format "%s/%s" $dir "dump.rdb"]
|
|
|
|
if {[dict exists $config "appenddirname"]} {
|
|
|
|
set aofdir [dict get $config "appenddirname"]
|
|
|
|
} else {
|
|
|
|
set aofdir "appendonlydir"
|
|
|
|
}
|
|
|
|
set aof_dirpath [format "%s/%s" $dir $aofdir]
|
|
|
|
clean_aof_persistence $aof_dirpath
|
2020-08-31 03:44:43 -04:00
|
|
|
catch {exec rm -rf $rdb}
|
|
|
|
}
|
|
|
|
|
2010-05-14 11:45:27 -04:00
|
|
|
proc kill_server config {
|
2010-06-14 04:19:45 -04:00
|
|
|
# nothing to kill when running against external server
|
|
|
|
if {$::external} return
|
|
|
|
|
2021-09-13 11:16:47 -04:00
|
|
|
# Close client connection if exists
|
|
|
|
if {[dict exists $config "client"]} {
|
|
|
|
[dict get $config "client"] close
|
|
|
|
}
|
|
|
|
|
2010-05-19 08:33:39 -04:00
|
|
|
# nevermind if its already dead
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
if {![is_alive $config]} {
|
|
|
|
# Check valgrind errors if needed
|
|
|
|
if {$::valgrind} {
|
|
|
|
check_valgrind_errors [dict get $config stderr]
|
|
|
|
}
|
2021-11-11 06:51:33 -05:00
|
|
|
|
|
|
|
check_sanitizer_errors [dict get $config stderr]
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
return
|
|
|
|
}
|
2010-05-14 11:45:27 -04:00
|
|
|
set pid [dict get $config pid]
|
|
|
|
|
2010-05-14 11:49:39 -04:00
|
|
|
# check for leaks
|
2010-06-02 15:20:29 -04:00
|
|
|
if {![dict exists $config "skipleaks"]} {
|
|
|
|
catch {
|
|
|
|
if {[string match {*Darwin*} [exec uname -a]]} {
|
2010-06-02 18:27:09 -04:00
|
|
|
tags {"leaks"} {
|
|
|
|
test "Check for memory leaks (pid $pid)" {
|
2012-12-03 06:06:38 -05:00
|
|
|
set output {0 leaks}
|
2020-12-23 09:28:17 -05:00
|
|
|
catch {exec leaks $pid} output option
|
|
|
|
# In a few tests we kill the server process, so leaks will not find it.
|
|
|
|
# It'll exits with exit code >1 on error, so we ignore these.
|
|
|
|
if {[dict exists $option -errorcode]} {
|
|
|
|
set details [dict get $option -errorcode]
|
|
|
|
if {[lindex $details 0] eq "CHILDSTATUS"} {
|
|
|
|
set status [lindex $details 2]
|
|
|
|
if {$status > 1} {
|
|
|
|
set output "0 leaks"
|
|
|
|
}
|
|
|
|
}
|
2014-03-25 04:33:27 -04:00
|
|
|
}
|
2012-12-03 06:06:38 -05:00
|
|
|
set output
|
2010-06-02 18:27:09 -04:00
|
|
|
} {*0 leaks*}
|
|
|
|
}
|
2010-06-02 15:20:29 -04:00
|
|
|
}
|
2010-05-14 11:49:39 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-14 11:45:27 -04:00
|
|
|
# kill server and wait for the process to be totally exited
|
2020-02-21 11:08:45 -05:00
|
|
|
send_data_packet $::test_server_fd server-killing $pid
|
2012-04-03 08:18:35 -04:00
|
|
|
catch {exec kill $pid}
|
2021-02-24 17:26:16 -05:00
|
|
|
# Node might have been stopped in the test
|
|
|
|
catch {exec kill -SIGCONT $pid}
|
2015-03-31 17:43:38 -04:00
|
|
|
if {$::valgrind} {
|
2021-10-26 01:34:30 -04:00
|
|
|
set max_wait 120000
|
2015-03-31 17:43:38 -04:00
|
|
|
} else {
|
|
|
|
set max_wait 10000
|
|
|
|
}
|
2010-05-19 08:33:39 -04:00
|
|
|
while {[is_alive $config]} {
|
2012-04-03 08:18:35 -04:00
|
|
|
incr wait 10
|
|
|
|
|
2021-10-26 01:34:30 -04:00
|
|
|
if {$wait == $max_wait} {
|
|
|
|
puts "Forcing process $pid to crash..."
|
|
|
|
catch {exec kill -SEGV $pid}
|
|
|
|
} elseif {$wait >= $max_wait * 2} {
|
2012-04-03 08:18:35 -04:00
|
|
|
puts "Forcing process $pid to exit..."
|
|
|
|
catch {exec kill -KILL $pid}
|
|
|
|
} elseif {$wait % 1000 == 0} {
|
2010-05-19 08:33:39 -04:00
|
|
|
puts "Waiting for process $pid to exit..."
|
2010-05-14 11:45:27 -04:00
|
|
|
}
|
|
|
|
after 10
|
|
|
|
}
|
2010-05-21 06:00:13 -04:00
|
|
|
|
|
|
|
# Check valgrind errors if needed
|
|
|
|
if {$::valgrind} {
|
|
|
|
check_valgrind_errors [dict get $config stderr]
|
|
|
|
}
|
2014-11-28 05:38:14 -05:00
|
|
|
|
2021-11-11 06:51:33 -05:00
|
|
|
check_sanitizer_errors [dict get $config stderr]
|
|
|
|
|
2014-11-28 05:38:14 -05:00
|
|
|
# Remove this pid from the set of active pids in the test server.
|
|
|
|
send_data_packet $::test_server_fd server-killed $pid
|
2010-05-14 11:45:27 -04:00
|
|
|
}
|
|
|
|
|
2010-05-19 08:33:39 -04:00
|
|
|
proc is_alive config {
|
|
|
|
set pid [dict get $config pid]
|
2020-10-18 07:50:29 -04:00
|
|
|
if {[catch {exec kill -0 $pid} err]} {
|
2010-05-19 08:33:39 -04:00
|
|
|
return 0
|
|
|
|
} else {
|
|
|
|
return 1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-21 06:00:13 -04:00
|
|
|
proc ping_server {host port} {
|
|
|
|
set retval 0
|
|
|
|
if {[catch {
|
2019-09-12 03:56:54 -04:00
|
|
|
if {$::tls} {
|
|
|
|
set fd [::tls::socket $host $port]
|
|
|
|
} else {
|
|
|
|
set fd [socket $host $port]
|
|
|
|
}
|
2010-05-21 06:00:13 -04:00
|
|
|
fconfigure $fd -translation binary
|
|
|
|
puts $fd "PING\r\n"
|
|
|
|
flush $fd
|
|
|
|
set reply [gets $fd]
|
2013-02-12 10:25:41 -05:00
|
|
|
if {[string range $reply 0 0] eq {+} ||
|
|
|
|
[string range $reply 0 0] eq {-}} {
|
2010-05-21 06:00:13 -04:00
|
|
|
set retval 1
|
|
|
|
}
|
|
|
|
close $fd
|
|
|
|
} e]} {
|
2010-12-10 10:13:21 -05:00
|
|
|
if {$::verbose} {
|
|
|
|
puts -nonewline "."
|
|
|
|
}
|
2010-08-31 05:17:06 -04:00
|
|
|
} else {
|
2010-12-10 10:13:21 -05:00
|
|
|
if {$::verbose} {
|
|
|
|
puts -nonewline "ok"
|
|
|
|
}
|
2010-05-21 06:00:13 -04:00
|
|
|
}
|
|
|
|
return $retval
|
|
|
|
}
|
|
|
|
|
2014-02-17 06:29:54 -05:00
|
|
|
# Return 1 if the server at the specified addr is reachable by PING, otherwise
|
|
|
|
# returns 0. Performs a try every 50 milliseconds for the specified number
|
|
|
|
# of retries.
|
|
|
|
proc server_is_up {host port retrynum} {
|
|
|
|
after 10 ;# Use a small delay to make likely a first-try success.
|
|
|
|
set retval 0
|
|
|
|
while {[incr retrynum -1]} {
|
|
|
|
if {[catch {ping_server $host $port} ping]} {
|
|
|
|
set ping 0
|
|
|
|
}
|
|
|
|
if {$ping} {return 1}
|
|
|
|
after 50
|
|
|
|
}
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2021-01-17 08:48:48 -05:00
|
|
|
# Check if current ::tags match requested tags. If ::allowtags are used,
|
|
|
|
# there must be some intersection. If ::denytags are used, no intersection
|
|
|
|
# is allowed. Returns 1 if tags are acceptable or 0 otherwise, in which
|
|
|
|
# case err_return names a return variable for the message to be logged.
|
2021-06-09 08:13:24 -04:00
|
|
|
proc tags_acceptable {tags err_return} {
|
2021-01-17 08:48:48 -05:00
|
|
|
upvar $err_return err
|
|
|
|
|
|
|
|
# If tags are whitelisted, make sure there's match
|
|
|
|
if {[llength $::allowtags] > 0} {
|
|
|
|
set matched 0
|
|
|
|
foreach tag $::allowtags {
|
2021-06-09 08:13:24 -04:00
|
|
|
if {[lsearch $tags $tag] >= 0} {
|
2021-01-17 08:48:48 -05:00
|
|
|
incr matched
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if {$matched < 1} {
|
|
|
|
set err "Tag: none of the tags allowed"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach tag $::denytags {
|
2021-06-09 08:13:24 -04:00
|
|
|
if {[lsearch $tags $tag] >= 0} {
|
2021-01-17 08:48:48 -05:00
|
|
|
set err "Tag: $tag denied"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-09 08:13:24 -04:00
|
|
|
if {$::external && [lsearch $tags "external:skip"] >= 0} {
|
|
|
|
set err "Not supported on external server"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
|
|
|
if {$::singledb && [lsearch $tags "singledb:skip"] >= 0} {
|
|
|
|
set err "Not supported on singledb"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
|
|
|
if {$::cluster_mode && [lsearch $tags "cluster:skip"] >= 0} {
|
|
|
|
set err "Not supported in cluster mode"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2021-09-26 10:45:02 -04:00
|
|
|
if {$::tls && [lsearch $tags "tls:skip"] >= 0} {
|
|
|
|
set err "Not supported in tls mode"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2021-11-03 14:47:18 -04:00
|
|
|
if {!$::large_memory && [lsearch $tags "large-memory"] >= 0} {
|
|
|
|
set err "large memory flag not provided"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2021-01-17 08:48:48 -05:00
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
2010-06-02 16:53:22 -04:00
|
|
|
# doesn't really belong here, but highly coupled to code in start_server
|
|
|
|
proc tags {tags code} {
|
2021-06-10 08:39:33 -04:00
|
|
|
# If we 'tags' contain multiple tags, quoted and separated by spaces,
|
2020-08-31 04:05:30 -04:00
|
|
|
# we want to get rid of the quotes in order to have a proper list
|
|
|
|
set tags [string map { \" "" } $tags]
|
2010-06-02 16:53:22 -04:00
|
|
|
set ::tags [concat $::tags $tags]
|
2021-06-09 08:13:24 -04:00
|
|
|
if {![tags_acceptable $::tags err]} {
|
2021-01-17 08:48:48 -05:00
|
|
|
incr ::num_aborted
|
|
|
|
send_data_packet $::test_server_fd ignore $err
|
|
|
|
set ::tags [lrange $::tags 0 end-[llength $tags]]
|
|
|
|
return
|
2020-08-31 04:05:30 -04:00
|
|
|
}
|
2010-06-02 16:53:22 -04:00
|
|
|
uplevel 1 $code
|
|
|
|
set ::tags [lrange $::tags 0 end-[llength $tags]]
|
|
|
|
}
|
2020-02-24 04:46:23 -05:00
|
|
|
|
|
|
|
# Write the configuration in the dictionary 'config' in the specified
|
|
|
|
# file name.
|
2022-07-12 13:41:29 -04:00
|
|
|
proc create_server_config_file {filename config config_lines} {
|
2020-02-24 04:46:23 -05:00
|
|
|
set fp [open $filename w+]
|
|
|
|
foreach directive [dict keys $config] {
|
|
|
|
puts -nonewline $fp "$directive "
|
|
|
|
puts $fp [dict get $config $directive]
|
|
|
|
}
|
2022-07-12 13:41:29 -04:00
|
|
|
foreach {config_line_directive config_line_args} $config_lines {
|
|
|
|
puts $fp "$config_line_directive $config_line_args"
|
|
|
|
}
|
2020-02-24 04:46:23 -05:00
|
|
|
close $fp
|
|
|
|
}
|
|
|
|
|
2022-05-09 06:37:49 -04:00
|
|
|
proc spawn_server {config_file stdout stderr args} {
|
|
|
|
set cmd [list src/redis-server $config_file]
|
|
|
|
set args {*}$args
|
|
|
|
if {[llength $args] > 0} {
|
|
|
|
lappend cmd {*}$args
|
|
|
|
}
|
|
|
|
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
if {$::valgrind} {
|
2022-05-09 06:37:49 -04:00
|
|
|
set pid [exec valgrind --track-origins=yes --trace-children=yes --suppressions=[pwd]/src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full {*}$cmd >> $stdout 2>> $stderr &]
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
} elseif ($::stack_logging) {
|
2022-05-09 06:37:49 -04:00
|
|
|
set pid [exec /usr/bin/env MallocStackLogging=1 MallocLogFile=/tmp/malloc_log.txt {*}$cmd >> $stdout 2>> $stderr &]
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
} else {
|
2021-11-11 06:51:33 -05:00
|
|
|
# ASAN_OPTIONS environment variable is for address sanitizer. If a test
|
|
|
|
# tries to allocate huge memory area and expects allocator to return
|
|
|
|
# NULL, address sanitizer throws an error without this setting.
|
2022-05-09 06:37:49 -04:00
|
|
|
set pid [exec /usr/bin/env ASAN_OPTIONS=allocator_may_return_null=1 {*}$cmd >> $stdout 2>> $stderr &]
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if {$::wait_server} {
|
|
|
|
set msg "server started PID: $pid. press any key to continue..."
|
|
|
|
puts $msg
|
|
|
|
read stdin 1
|
|
|
|
}
|
|
|
|
|
|
|
|
# Tell the test server about this new instance.
|
|
|
|
send_data_packet $::test_server_fd server-spawned $pid
|
|
|
|
return $pid
|
|
|
|
}
|
|
|
|
|
|
|
|
# Wait for actual startup, return 1 if port is busy, 0 otherwise
|
|
|
|
proc wait_server_started {config_file stdout pid} {
|
|
|
|
set checkperiod 100; # Milliseconds
|
|
|
|
set maxiter [expr {120*1000/$checkperiod}] ; # Wait up to 2 minutes.
|
|
|
|
set port_busy 0
|
|
|
|
while 1 {
|
|
|
|
if {[regexp -- " PID: $pid" [exec cat $stdout]]} {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
after $checkperiod
|
|
|
|
incr maxiter -1
|
|
|
|
if {$maxiter == 0} {
|
|
|
|
start_server_error $config_file "No PID detected in log $stdout"
|
|
|
|
puts "--- LOG CONTENT ---"
|
|
|
|
puts [exec cat $stdout]
|
|
|
|
puts "-------------------"
|
|
|
|
break
|
|
|
|
}
|
|
|
|
|
|
|
|
# Check if the port is actually busy and the server failed
|
|
|
|
# for this reason.
|
2021-03-16 11:25:30 -04:00
|
|
|
if {[regexp {Failed listening on port} [exec cat $stdout]]} {
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
set port_busy 1
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return $port_busy
|
|
|
|
}
|
|
|
|
|
2021-02-07 05:37:24 -05:00
|
|
|
proc dump_server_log {srv} {
|
|
|
|
set pid [dict get $srv "pid"]
|
|
|
|
puts "\n===== Start of server log (pid $pid) =====\n"
|
|
|
|
puts [exec cat [dict get $srv "stdout"]]
|
|
|
|
puts "===== End of server log (pid $pid) =====\n"
|
2021-11-11 06:51:33 -05:00
|
|
|
|
|
|
|
puts "\n===== Start of server stderr log (pid $pid) =====\n"
|
|
|
|
puts [exec cat [dict get $srv "stderr"]]
|
|
|
|
puts "===== End of server stderr log (pid $pid) =====\n"
|
2021-02-07 05:37:24 -05:00
|
|
|
}
|
|
|
|
|
2021-06-09 08:13:24 -04:00
|
|
|
proc run_external_server_test {code overrides} {
|
|
|
|
set srv {}
|
|
|
|
dict set srv "host" $::host
|
|
|
|
dict set srv "port" $::port
|
|
|
|
set client [redis $::host $::port 0 $::tls]
|
|
|
|
dict set srv "client" $client
|
|
|
|
if {!$::singledb} {
|
|
|
|
$client select 9
|
|
|
|
}
|
|
|
|
|
|
|
|
set config {}
|
|
|
|
dict set config "port" $::port
|
|
|
|
dict set srv "config" $config
|
|
|
|
|
|
|
|
# append the server to the stack
|
|
|
|
lappend ::servers $srv
|
|
|
|
|
|
|
|
if {[llength $::servers] > 1} {
|
|
|
|
if {$::verbose} {
|
|
|
|
puts "Notice: nested start_server statements in external server mode, test must be aware of that!"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
r flushall
|
2021-12-16 10:58:25 -05:00
|
|
|
r function flush
|
2021-06-09 08:13:24 -04:00
|
|
|
|
|
|
|
# store overrides
|
|
|
|
set saved_config {}
|
|
|
|
foreach {param val} $overrides {
|
|
|
|
dict set saved_config $param [lindex [r config get $param] 1]
|
|
|
|
r config set $param $val
|
|
|
|
|
|
|
|
# If we enable appendonly, wait for for rewrite to complete. This is
|
|
|
|
# required for tests that begin with a bg* command which will fail if
|
|
|
|
# the rewriteaof operation is not completed at this point.
|
|
|
|
if {$param == "appendonly" && $val == "yes"} {
|
|
|
|
waitForBgrewriteaof r
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if {[catch {set retval [uplevel 2 $code]} error]} {
|
|
|
|
if {$::durable} {
|
|
|
|
set msg [string range $error 10 end]
|
|
|
|
lappend details $msg
|
|
|
|
lappend details $::errorInfo
|
|
|
|
lappend ::tests_failed $details
|
|
|
|
|
|
|
|
incr ::num_failed
|
|
|
|
send_data_packet $::test_server_fd err [join $details "\n"]
|
|
|
|
} else {
|
|
|
|
# Re-raise, let handler up the stack take care of this.
|
|
|
|
error $error $::errorInfo
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# restore overrides
|
|
|
|
dict for {param val} $saved_config {
|
|
|
|
r config set $param $val
|
|
|
|
}
|
|
|
|
|
2021-11-15 04:07:43 -05:00
|
|
|
set srv [lpop ::servers]
|
|
|
|
|
|
|
|
if {[dict exists $srv "client"]} {
|
|
|
|
[dict get $srv "client"] close
|
|
|
|
}
|
2021-06-09 08:13:24 -04:00
|
|
|
}
|
|
|
|
|
2010-06-02 16:23:52 -04:00
|
|
|
proc start_server {options {code undefined}} {
|
|
|
|
# setup defaults
|
|
|
|
set baseconfig "default.conf"
|
|
|
|
set overrides {}
|
2020-12-11 11:31:40 -05:00
|
|
|
set omit {}
|
2010-06-02 16:53:22 -04:00
|
|
|
set tags {}
|
2022-05-09 06:37:49 -04:00
|
|
|
set args {}
|
2020-08-31 03:44:43 -04:00
|
|
|
set keep_persistence false
|
2022-07-12 13:41:29 -04:00
|
|
|
set config_lines {}
|
2010-06-02 16:23:52 -04:00
|
|
|
|
|
|
|
# parse options
|
|
|
|
foreach {option value} $options {
|
|
|
|
switch $option {
|
2010-06-02 16:53:22 -04:00
|
|
|
"config" {
|
2020-08-31 03:44:43 -04:00
|
|
|
set baseconfig $value
|
|
|
|
}
|
2010-06-02 16:53:22 -04:00
|
|
|
"overrides" {
|
2020-08-31 03:44:43 -04:00
|
|
|
set overrides $value
|
|
|
|
}
|
2022-07-12 13:41:29 -04:00
|
|
|
"config_lines" {
|
|
|
|
set config_lines $value
|
|
|
|
}
|
2022-05-09 06:37:49 -04:00
|
|
|
"args" {
|
|
|
|
set args $value
|
|
|
|
}
|
2020-12-11 11:31:40 -05:00
|
|
|
"omit" {
|
|
|
|
set omit $value
|
|
|
|
}
|
2010-06-02 16:53:22 -04:00
|
|
|
"tags" {
|
2021-06-10 08:39:33 -04:00
|
|
|
# If we 'tags' contain multiple tags, quoted and separated by spaces,
|
2020-08-31 04:05:30 -04:00
|
|
|
# we want to get rid of the quotes in order to have a proper list
|
|
|
|
set tags [string map { \" "" } $value]
|
|
|
|
set ::tags [concat $::tags $tags]
|
2020-08-31 03:44:43 -04:00
|
|
|
}
|
|
|
|
"keep_persistence" {
|
|
|
|
set keep_persistence $value
|
|
|
|
}
|
2010-06-02 16:53:22 -04:00
|
|
|
default {
|
2020-08-31 03:44:43 -04:00
|
|
|
error "Unknown option $option"
|
|
|
|
}
|
2010-06-02 16:23:52 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-31 04:05:30 -04:00
|
|
|
# We skip unwanted tags
|
2021-06-09 08:13:24 -04:00
|
|
|
if {![tags_acceptable $::tags err]} {
|
2021-01-17 08:48:48 -05:00
|
|
|
incr ::num_aborted
|
|
|
|
send_data_packet $::test_server_fd ignore $err
|
|
|
|
set ::tags [lrange $::tags 0 end-[llength $tags]]
|
|
|
|
return
|
2020-08-31 04:05:30 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
# If we are running against an external server, we just push the
|
|
|
|
# host/port pair in the stack the first time
|
|
|
|
if {$::external} {
|
2021-06-09 08:13:24 -04:00
|
|
|
run_external_server_test $code $overrides
|
|
|
|
|
2020-08-31 04:05:30 -04:00
|
|
|
set ::tags [lrange $::tags 0 end-[llength $tags]]
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2010-06-02 16:23:52 -04:00
|
|
|
set data [split [exec cat "tests/assets/$baseconfig"] "\n"]
|
2010-05-14 11:31:11 -04:00
|
|
|
set config {}
|
2019-09-12 03:56:54 -04:00
|
|
|
if {$::tls} {
|
2020-12-11 11:31:40 -05:00
|
|
|
dict set config "tls-cert-file" [format "%s/tests/tls/server.crt" [pwd]]
|
|
|
|
dict set config "tls-key-file" [format "%s/tests/tls/server.key" [pwd]]
|
|
|
|
dict set config "tls-client-cert-file" [format "%s/tests/tls/client.crt" [pwd]]
|
|
|
|
dict set config "tls-client-key-file" [format "%s/tests/tls/client.key" [pwd]]
|
2019-09-12 03:56:54 -04:00
|
|
|
dict set config "tls-dh-params-file" [format "%s/tests/tls/redis.dh" [pwd]]
|
|
|
|
dict set config "tls-ca-cert-file" [format "%s/tests/tls/ca.crt" [pwd]]
|
|
|
|
dict set config "loglevel" "debug"
|
|
|
|
}
|
2010-05-14 11:31:11 -04:00
|
|
|
foreach line $data {
|
|
|
|
if {[string length $line] > 0 && [string index $line 0] ne "#"} {
|
|
|
|
set elements [split $line " "]
|
|
|
|
set directive [lrange $elements 0 0]
|
|
|
|
set arguments [lrange $elements 1 end]
|
|
|
|
dict set config $directive $arguments
|
|
|
|
}
|
|
|
|
}
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2010-05-14 11:31:11 -04:00
|
|
|
# use a different directory every time a server is started
|
|
|
|
dict set config dir [tmpdir server]
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2010-05-14 11:42:07 -04:00
|
|
|
# start every server on a different port
|
2020-05-26 04:00:48 -04:00
|
|
|
set port [find_available_port $::baseport $::portcount]
|
2019-09-12 03:56:54 -04:00
|
|
|
if {$::tls} {
|
|
|
|
dict set config "port" 0
|
2020-05-26 04:00:48 -04:00
|
|
|
dict set config "tls-port" $port
|
2019-09-12 03:56:54 -04:00
|
|
|
dict set config "tls-cluster" "yes"
|
|
|
|
dict set config "tls-replication" "yes"
|
|
|
|
} else {
|
2020-05-26 04:00:48 -04:00
|
|
|
dict set config port $port
|
2019-09-12 03:56:54 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
set unixsocket [file normalize [format "%s/%s" [dict get $config "dir"] "socket"]]
|
|
|
|
dict set config "unixsocket" $unixsocket
|
2010-05-14 11:42:07 -04:00
|
|
|
|
2010-05-20 07:58:58 -04:00
|
|
|
# apply overrides from global space and arguments
|
2010-06-02 16:23:52 -04:00
|
|
|
foreach {directive arguments} [concat $::global_overrides $overrides] {
|
2010-05-14 11:31:11 -04:00
|
|
|
dict set config $directive $arguments
|
|
|
|
}
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2020-12-11 11:31:40 -05:00
|
|
|
# remove directives that are marked to be omitted
|
|
|
|
foreach directive $omit {
|
|
|
|
dict unset config $directive
|
|
|
|
}
|
|
|
|
|
2010-05-14 11:31:11 -04:00
|
|
|
# write new configuration to temporary file
|
|
|
|
set config_file [tmpfile redis.conf]
|
2022-07-12 13:41:29 -04:00
|
|
|
create_server_config_file $config_file $config $config_lines
|
2010-05-14 11:31:11 -04:00
|
|
|
|
|
|
|
set stdout [format "%s/%s" [dict get $config "dir"] "stdout"]
|
|
|
|
set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
|
2010-05-21 06:00:13 -04:00
|
|
|
|
2020-08-31 03:23:09 -04:00
|
|
|
# if we're inside a test, write the test name to the server log file
|
|
|
|
if {[info exists ::cur_test]} {
|
|
|
|
set fd [open $stdout "a+"]
|
|
|
|
puts $fd "### Starting server for test $::cur_test"
|
|
|
|
close $fd
|
|
|
|
}
|
|
|
|
|
2022-01-24 15:31:35 -05:00
|
|
|
# We may have a stdout left over from the previous tests, so we need
|
|
|
|
# to get the current count of ready logs
|
|
|
|
set previous_ready_count [count_message_lines $stdout "Ready to accept"]
|
|
|
|
|
2020-02-24 04:46:23 -05:00
|
|
|
# We need a loop here to retry with different ports.
|
|
|
|
set server_started 0
|
|
|
|
while {$server_started == 0} {
|
|
|
|
if {$::verbose} {
|
2020-05-26 04:00:48 -04:00
|
|
|
puts -nonewline "=== ($tags) Starting server ${::host}:${port} "
|
2020-02-24 04:46:23 -05:00
|
|
|
}
|
2020-02-21 11:08:45 -05:00
|
|
|
|
2020-05-26 04:00:48 -04:00
|
|
|
send_data_packet $::test_server_fd "server-spawning" "port $port"
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2022-05-09 06:37:49 -04:00
|
|
|
set pid [spawn_server $config_file $stdout $stderr $args]
|
2020-02-24 04:46:23 -05:00
|
|
|
|
|
|
|
# check that the server actually started
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
set port_busy [wait_server_started $config_file $stdout $pid]
|
2010-12-10 10:13:21 -05:00
|
|
|
|
2020-02-24 04:46:23 -05:00
|
|
|
# Sometimes we have to try a different port, even if we checked
|
|
|
|
# for availability. Other test clients may grab the port before we
|
|
|
|
# are able to do it for example.
|
|
|
|
if {$port_busy} {
|
2020-05-26 04:00:48 -04:00
|
|
|
puts "Port $port was already busy, trying another port..."
|
|
|
|
set port [find_available_port $::baseport $::portcount]
|
2020-02-24 04:46:23 -05:00
|
|
|
if {$::tls} {
|
2020-05-26 04:00:48 -04:00
|
|
|
dict set config "tls-port" $port
|
2020-02-24 04:46:23 -05:00
|
|
|
} else {
|
2020-05-26 04:00:48 -04:00
|
|
|
dict set config port $port
|
2020-02-24 04:46:23 -05:00
|
|
|
}
|
2022-07-12 13:41:29 -04:00
|
|
|
create_server_config_file $config_file $config $config_lines
|
2020-09-07 10:30:36 -04:00
|
|
|
|
|
|
|
# Truncate log so wait_server_started will not be looking at
|
|
|
|
# output of the failed server.
|
|
|
|
close [open $stdout "w"]
|
|
|
|
|
2020-02-24 04:46:23 -05:00
|
|
|
continue; # Try again
|
|
|
|
}
|
2010-12-10 10:13:21 -05:00
|
|
|
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
if {$::valgrind} {set retrynum 1000} else {set retrynum 100}
|
2020-02-24 04:46:23 -05:00
|
|
|
if {$code ne "undefined"} {
|
2020-05-26 04:00:48 -04:00
|
|
|
set serverisup [server_is_up $::host $port $retrynum]
|
2020-02-24 04:46:23 -05:00
|
|
|
} else {
|
|
|
|
set serverisup 1
|
|
|
|
}
|
2010-08-31 05:17:06 -04:00
|
|
|
|
2020-02-24 04:46:23 -05:00
|
|
|
if {$::verbose} {
|
|
|
|
puts ""
|
|
|
|
}
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2020-02-24 04:46:23 -05:00
|
|
|
if {!$serverisup} {
|
|
|
|
set err {}
|
|
|
|
append err [exec cat $stdout] "\n" [exec cat $stderr]
|
|
|
|
start_server_error $config_file $err
|
|
|
|
return
|
2020-02-21 12:55:56 -05:00
|
|
|
}
|
2020-02-24 04:46:23 -05:00
|
|
|
set server_started 1
|
2014-11-28 05:49:26 -05:00
|
|
|
}
|
|
|
|
|
2010-05-19 08:33:39 -04:00
|
|
|
# setup properties to be able to initialize a client object
|
2019-09-12 03:56:54 -04:00
|
|
|
set port_param [expr $::tls ? {"tls-port"} : {"port"}]
|
2010-05-14 11:31:11 -04:00
|
|
|
set host $::host
|
|
|
|
if {[dict exists $config bind]} { set host [dict get $config bind] }
|
2019-09-12 03:56:54 -04:00
|
|
|
if {[dict exists $config $port_param]} { set port [dict get $config $port_param] }
|
2010-05-14 11:31:11 -04:00
|
|
|
|
2010-05-14 11:45:27 -04:00
|
|
|
# setup config dict
|
2010-10-13 05:25:40 -04:00
|
|
|
dict set srv "config_file" $config_file
|
|
|
|
dict set srv "config" $config
|
2010-05-14 14:50:32 -04:00
|
|
|
dict set srv "pid" $pid
|
|
|
|
dict set srv "host" $host
|
|
|
|
dict set srv "port" $port
|
|
|
|
dict set srv "stdout" $stdout
|
|
|
|
dict set srv "stderr" $stderr
|
2019-09-12 03:56:54 -04:00
|
|
|
dict set srv "unixsocket" $unixsocket
|
2010-05-14 11:45:27 -04:00
|
|
|
|
2010-05-19 08:33:39 -04:00
|
|
|
# if a block of code is supplied, we wait for the server to become
|
|
|
|
# available, create a client object and kill the server afterwards
|
2010-05-14 11:31:11 -04:00
|
|
|
if {$code ne "undefined"} {
|
2010-05-19 08:33:39 -04:00
|
|
|
set line [exec head -n1 $stdout]
|
|
|
|
if {[string match {*already in use*} $line]} {
|
|
|
|
error_and_quit $config_file $line
|
|
|
|
}
|
|
|
|
|
|
|
|
while 1 {
|
|
|
|
# check that the server actually started and is ready for connections
|
2022-01-24 15:31:35 -05:00
|
|
|
if {[count_message_lines $stdout "Ready to accept"] > $previous_ready_count} {
|
2010-05-19 08:33:39 -04:00
|
|
|
break
|
|
|
|
}
|
|
|
|
after 10
|
|
|
|
}
|
|
|
|
|
2010-05-14 14:50:32 -04:00
|
|
|
# append the server to the stack
|
|
|
|
lappend ::servers $srv
|
2010-10-13 05:25:40 -04:00
|
|
|
|
|
|
|
# connect client (after server dict is put on the stack)
|
|
|
|
reconnect
|
|
|
|
|
2021-02-07 05:37:24 -05:00
|
|
|
# remember previous num_failed to catch new errors
|
|
|
|
set prev_num_failed $::num_failed
|
|
|
|
|
2010-05-14 11:31:11 -04:00
|
|
|
# execute provided block
|
2010-12-10 10:13:21 -05:00
|
|
|
set num_tests $::num_tests
|
|
|
|
if {[catch { uplevel 1 $code } error]} {
|
|
|
|
set backtrace $::errorInfo
|
2021-04-18 04:55:54 -04:00
|
|
|
set assertion [string match "assertion:*" $error]
|
2010-12-10 10:13:21 -05:00
|
|
|
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
# fetch srv back from the server list, in case it was restarted by restart_server (new PID)
|
|
|
|
set srv [lindex $::servers end]
|
|
|
|
|
2020-07-21 09:56:19 -04:00
|
|
|
# pop the server object
|
|
|
|
set ::servers [lrange $::servers 0 end-1]
|
|
|
|
|
2010-12-10 10:13:21 -05:00
|
|
|
# Kill the server without checking for leaks
|
|
|
|
dict set srv "skipleaks" 1
|
|
|
|
kill_server $srv
|
|
|
|
|
2021-04-18 04:55:54 -04:00
|
|
|
if {$::dump_logs && $assertion} {
|
|
|
|
# if we caught an assertion ($::num_failed isn't incremented yet)
|
|
|
|
# this happens when the test spawns a server and not the other way around
|
|
|
|
dump_server_log $srv
|
2010-12-10 10:13:21 -05:00
|
|
|
} else {
|
2021-04-18 04:55:54 -04:00
|
|
|
# Print crash report from log
|
|
|
|
set crashlog [crashlog_from_file [dict get $srv "stdout"]]
|
|
|
|
if {[string length $crashlog] > 0} {
|
|
|
|
puts [format "\nLogged crash report (pid %d):" [dict get $srv "pid"]]
|
|
|
|
puts "$crashlog"
|
|
|
|
puts ""
|
|
|
|
}
|
2021-11-11 06:51:33 -05:00
|
|
|
|
|
|
|
set sanitizerlog [sanitizer_errors_from_file [dict get $srv "stderr"]]
|
|
|
|
if {[string length $sanitizerlog] > 0} {
|
|
|
|
puts [format "\nLogged sanitizer errors (pid %d):" [dict get $srv "pid"]]
|
|
|
|
puts "$sanitizerlog"
|
|
|
|
puts ""
|
|
|
|
}
|
2010-12-10 10:13:21 -05:00
|
|
|
}
|
|
|
|
|
2021-04-18 04:55:54 -04:00
|
|
|
if {!$assertion && $::durable} {
|
|
|
|
# durable is meant to prevent the whole tcl test from exiting on
|
|
|
|
# an exception. an assertion will be caught by the test proc.
|
2020-08-31 04:24:17 -04:00
|
|
|
set msg [string range $error 10 end]
|
|
|
|
lappend details $msg
|
|
|
|
lappend details $backtrace
|
|
|
|
lappend ::tests_failed $details
|
|
|
|
|
|
|
|
incr ::num_failed
|
|
|
|
send_data_packet $::test_server_fd err [join $details "\n"]
|
|
|
|
} else {
|
|
|
|
# Re-raise, let handler up the stack take care of this.
|
|
|
|
error $error $backtrace
|
|
|
|
}
|
2021-02-07 05:37:24 -05:00
|
|
|
} else {
|
|
|
|
if {$::dump_logs && $prev_num_failed != $::num_failed} {
|
|
|
|
dump_server_log $srv
|
|
|
|
}
|
2010-08-21 04:54:31 -04:00
|
|
|
}
|
|
|
|
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
# fetch srv back from the server list, in case it was restarted by restart_server (new PID)
|
|
|
|
set srv [lindex $::servers end]
|
|
|
|
|
2010-12-10 10:13:21 -05:00
|
|
|
# Don't do the leak check when no tests were run
|
|
|
|
if {$num_tests == $::num_tests} {
|
2010-06-02 16:53:22 -04:00
|
|
|
dict set srv "skipleaks" 1
|
|
|
|
}
|
2010-05-14 11:31:11 -04:00
|
|
|
|
2010-05-14 14:50:32 -04:00
|
|
|
# pop the server object
|
|
|
|
set ::servers [lrange $::servers 0 end-1]
|
2010-06-02 15:20:29 -04:00
|
|
|
|
2010-06-02 18:25:32 -04:00
|
|
|
set ::tags [lrange $::tags 0 end-[llength $tags]]
|
2010-06-02 15:20:29 -04:00
|
|
|
kill_server $srv
|
2020-08-31 03:44:43 -04:00
|
|
|
if {!$keep_persistence} {
|
|
|
|
clean_persistence $srv
|
|
|
|
}
|
|
|
|
set _ ""
|
2010-05-14 11:31:11 -04:00
|
|
|
} else {
|
2010-06-02 18:25:32 -04:00
|
|
|
set ::tags [lrange $::tags 0 end-[llength $tags]]
|
2010-05-14 14:50:32 -04:00
|
|
|
set _ $srv
|
2010-05-14 11:31:11 -04:00
|
|
|
}
|
|
|
|
}
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
|
2022-03-16 13:11:38 -04:00
|
|
|
# Start multiple servers with the same options, run code, then stop them.
|
|
|
|
proc start_multiple_servers {num options code} {
|
|
|
|
for {set i 0} {$i < $num} {incr i} {
|
|
|
|
set code [list start_server $options $code]
|
|
|
|
}
|
|
|
|
uplevel 1 $code
|
|
|
|
}
|
|
|
|
|
2022-01-02 02:50:15 -05:00
|
|
|
proc restart_server {level wait_ready rotate_logs {reconnect 1} {shutdown sigterm}} {
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
set srv [lindex $::servers end+$level]
|
2022-01-02 02:50:15 -05:00
|
|
|
if {$shutdown ne {sigterm}} {
|
|
|
|
catch {[dict get $srv "client"] shutdown $shutdown}
|
|
|
|
}
|
|
|
|
# Kill server doesn't mind if the server is already dead
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
kill_server $srv
|
2021-09-13 11:16:47 -04:00
|
|
|
# Remove the default client from the server
|
|
|
|
dict unset srv "client"
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
|
2020-08-14 09:05:34 -04:00
|
|
|
set pid [dict get $srv "pid"]
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
set stdout [dict get $srv "stdout"]
|
|
|
|
set stderr [dict get $srv "stderr"]
|
2020-08-14 09:05:34 -04:00
|
|
|
if {$rotate_logs} {
|
|
|
|
set ts [clock format [clock seconds] -format %y%m%d%H%M%S]
|
|
|
|
file rename $stdout $stdout.$ts.$pid
|
|
|
|
file rename $stderr $stderr.$ts.$pid
|
|
|
|
}
|
|
|
|
set prev_ready_count [count_message_lines $stdout "Ready to accept"]
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
|
2020-08-31 03:23:09 -04:00
|
|
|
# if we're inside a test, write the test name to the server log file
|
|
|
|
if {[info exists ::cur_test]} {
|
|
|
|
set fd [open $stdout "a+"]
|
|
|
|
puts $fd "### Restarting server for test $::cur_test"
|
|
|
|
close $fd
|
|
|
|
}
|
|
|
|
|
2020-08-14 09:05:34 -04:00
|
|
|
set config_file [dict get $srv "config_file"]
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
|
2022-05-09 06:37:49 -04:00
|
|
|
set pid [spawn_server $config_file $stdout $stderr {}]
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
|
|
|
|
# check that the server actually started
|
|
|
|
wait_server_started $config_file $stdout $pid
|
|
|
|
|
|
|
|
# update the pid in the servers list
|
|
|
|
dict set srv "pid" $pid
|
|
|
|
# re-set $srv in the servers list
|
|
|
|
lset ::servers end+$level $srv
|
|
|
|
|
|
|
|
if {$wait_ready} {
|
|
|
|
while 1 {
|
|
|
|
# check that the server actually started and is ready for connections
|
2020-08-14 09:05:34 -04:00
|
|
|
if {[count_message_lines $stdout "Ready to accept"] > $prev_ready_count} {
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
break
|
|
|
|
}
|
|
|
|
after 10
|
|
|
|
}
|
|
|
|
}
|
2021-06-22 05:50:17 -04:00
|
|
|
if {$reconnect} {
|
|
|
|
reconnect $level
|
|
|
|
}
|
tests/valgrind: don't use debug restart (#7404)
* tests/valgrind: don't use debug restart
DEBUG REATART causes two issues:
1. it uses execve which replaces the original process and valgrind doesn't
have a chance to check for errors, so leaks go unreported.
2. valgrind report invalid calls to close() which we're unable to resolve.
So now the tests use restart_server mechanism in the tests, that terminates
the old server and starts a new one, new PID, but same stdout, stderr.
since the stderr can contain two or more valgrind report, it is not enough
to just check for the absence of leaks, we also need to check for some known
errors, we do both, and fail if we either find an error, or can't find a
report saying there are no leaks.
other changes:
- when killing a server that was already terminated we check for leaks too.
- adding DEBUG LEAK which was used to test it.
- adding --trace-children to valgrind, although no longer needed.
- since the stdout contains two or more runs, we need slightly different way
of checking if the new process is up (explicitly looking for the new PID)
- move the code that handles --wait-server to happen earlier (before
watching the startup message in the log), and serve the restarted server too.
* squashme - CR fixes
2020-07-10 01:26:52 -04:00
|
|
|
}
|