RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-29 02:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_suite: fix: kill all running test scripts even in resource_quick_prepare_first_resource

Browse Source
This commit is contained in:
Frank Liepold 2014-01-29 12:07:47 +01:00
parent 5a3dd45384
commit 6a8468ad63
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test_suite/scripts/modules/38_resource.sh
View File

@ -46,6 +46,7 @@ function resource_quick_prepare_first_resource
if [ $net_clear_iptables_in_prepare_phase -eq 1 ]; then
net_clear_iptables_all
fi
resource_kill_all_scripts
cluster_rmmod_mars_all
cluster_clear_and_mount_mars_dir_all
cluster_insert_mars_module_all
@ -662,6 +663,7 @@ function resource_kill_all_scripts
{
local host
for host in "${main_host_list[@]}"; do
lib_vmsg " killing all $main_prefix_scripts scripts on $host"
lib_remote_idfile $host 'for p in $(pgrep -f '"$main_prefix_scripts"'); do if [ $p -ne $$ ] && ps -p $p >/dev/null; then echo killing:; ps -fp $p; kill -9 $p; fi; done'
done
}