hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MaxCtrl cluster tests

Browse Source 
The configuration used an invalid parameter name which caused the two
MaxScales to use the same directory for persisted configurations.

The test also tried to sync with the wrong server causing the same
listener to be created twice on the same port but on different MaxScales.

Cleaned up the startup and shutdown scripts to always start from a clean
state.
This commit is contained in:
Markus Mäkelä
2018-08-09 06:18:30 +03:00
parent b69fc4d32c
commit 1447ac2eb9
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/stop_maxscale.sh
View File

@ -1,8 +1,7 @@
#!/bin/bash
#
# This script is run after each test block. It kills the MaxScale process
# and cleans up the directories that contain generated files.
# This script is run after each test block. It kills the MaxScale process.
#
maxscaledir=$MAXSCALE_DIR
@ -18,11 +17,4 @@ done
# If it wasn't dead before, now it is
pkill -9 '^maxscale$'
rm -r $maxscaledir/lib/maxscale
rm -r $maxscaledir/cache/maxscale
rm -r $maxscaledir/run/maxscale
test -f /tmp/maxadmin.sock && rm /tmp/maxadmin.sock
mkdir -m 0755 -p $maxscaledir/lib/maxscale
mkdir -m 0755 -p $maxscaledir/cache/maxscale
mkdir -m 0755 -p $maxscaledir/run/maxscale
exit 0