Cherry-pick: Fall back to pkill in run_ctrl_c.sh

The pkill executable is provided by the same package that provides ps
which is why it is more likely to be installed. Seems that the test VMs
don't always have killall installed.

Run the MaxScale process with the maxscale user instead of the root user
to prevent any new files from being owned by a different user.

Cherry-picked the commit a06c122a5e050071589f724758d6bbd3d8d3f419 from
develop.
This commit is contained in:
Markus Mäkelä 2019-10-26 19:12:05 +03:00
parent 1d8139587b
commit aeab1bdc7d
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
2 changed files with 2 additions and 2 deletions

View File

@ -1,3 +1,3 @@
sleep 5
sudo /usr/bin/killall maxscale -s INT
sudo /usr/bin/killall maxscale -s INT || sudo pkill -INT maxscale

View File

@ -10,7 +10,7 @@ fi
T="$(date +%s)"
sudo maxscale -d -U root
sudo maxscale -d -U maxscale
if [ $? -ne 0 ] ; then
exit 1
fi