git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e29b631
)
Handle testsuite dual-daemon redis start/reap
author
Graeme Fowler
<graemef@exim.org>
Fri, 9 Mar 2018 15:34:13 +0000
(15:34 +0000)
committer
Graeme Fowler
<graemef@exim.org>
Fri, 9 Mar 2018 15:34:13 +0000
(15:34 +0000)
test/scripts/2701-redis-cluster/2701
patch
|
blob
|
history
diff --git
a/test/scripts/2701-redis-cluster/2701
b/test/scripts/2701-redis-cluster/2701
index 821d2c39eec23ecc953b620c8ccb9a6a89c09b06..85f05b74fa2e3b6567396145ec8d10f8f027e37b 100644
(file)
--- a/
test/scripts/2701-redis-cluster/2701
+++ b/
test/scripts/2701-redis-cluster/2701
@@
-2,17
+2,17
@@
#
#
echo Setting up 2-node cluster...
#
#
echo Setting up 2-node cluster...
-sudo rm -fr DIR/
node1 DIR/node2
-mkdir -p DIR/
node1 DIR
/node2
+sudo rm -fr DIR/
redis-cluster
+mkdir -p DIR/
redis-cluster/node1 DIR/redis-cluster
/node2
#
echo Starting node1
#
echo Starting node1
-background
-redis-server --bind 127.0.0.1 --port 6379 --cluster-enabled yes --cluster-config-file node1.conf --dir DIR/node1 --logfile /dev/null
+perl
+system 'redis-server --bind 127.0.0.1 --port 6379 --cluster-enabled yes --cluster-config-file node1.conf --dir DIR/redis-cluster/node1 --logfile node1.log --daemonize yes --pidfile node1.pid --loglevel debug';
****
sleep 5
echo Starting node2
****
sleep 5
echo Starting node2
-background
-redis-server --bind 127.0.0.1 --port 6380 --cluster-enabled yes --cluster-config-file node2.conf --dir DIR/node2 --logfile /dev/null
+perl
+system 'redis-server --bind 127.0.0.1 --port 6380 --cluster-enabled yes --cluster-config-file node2.conf --dir DIR/redis-cluster/node2 --logfile node2.log --daemonize yes --pidfile node2.pid --loglevel debug';
****
#
sleep 5
****
#
sleep 5
@@
-41,5
+41,18
@@
${lookup redis{get ${quote_redis:KEY_100_1001 ABCDEF}}}
${lookup redis{get ${quote_redis:01t67it}}}
****
#
${lookup redis{get ${quote_redis:01t67it}}}
****
#
-killdaemon
+sleep 5
+perl
+my @pidfiles = ( "DIR/redis-cluster/node1/node1.pid", "DIR/redis-cluster/node2/
+foreach my $pidfile (@pidfiles) {
+ if ( -f $pidfile ) {
+ open (my $fh, "<", $pidfile);
+ while (my $pid = <$fh>) {
+ chomp $pid;
+ kill 'TERM', $pid;
+ }
+ }
+}
+****
+sudo rm -fr DIR/redis-cluster
no_stderr_check
no_stderr_check