RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test_suite: renaming

This commit is contained in:
Frank Liepold 2014-01-20 10:08:43 +01:00
parent 0215a9b0d2
commit a4689aac50
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -659,3 +659,33 @@ function resource_kill_all_scripts
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' 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 done
} }
function resource_check_replication
{
local primary_host=$1 secondary_host=$2 res=$3
local data_dev=$(resource_get_data_device $res)
lib_vmsg " check replication, primary=$primary_host, secondary=$secondary_host"
marsadm_do_cmd $primary_host "wait-resource" "$res is-device-on" || \
lib_exit 1
lib_vmsg " write some data to $primary_host:$data_dev"
local count=0 maxcount=3
while true; do
lib_remote_idfile $primary_host \
"yes | dd oflag=direct bs=4096 count=1 of=$data_dev" \
|| lib_exit 1
if [ $switch2primary_logrotate_new_primary -eq 0 ]; then
break
fi
marsadm_do_cmd $primary_host "log-rotate" $res || lib_exit 1
if [ $(($count % 2 )) -eq 0 ]; then
marsadm_do_cmd $primary_host "log-delete" $res || lib_exit 1
fi
let count+=1
if [ $count -eq $maxcount ]; then
break
fi
done
lib_wait_for_secondary_to_become_uptodate_and_cmp_cksums "resource" \
$new_secondary $primary_host \
$res $data_dev 0
}

34
test_suite/scripts/modules/65_switch2primary.sh
View File

@ -173,7 +173,7 @@ function switch2primary_force
if [ $switch2primary_orig_prim_equal_new_prim -eq 1 ]; then if [ $switch2primary_orig_prim_equal_new_prim -eq 1 ]; then
marsadm_do_cmd $new_primary "primary" "$res" || lib_exit 1 marsadm_do_cmd $new_primary "primary" "$res" || lib_exit 1
fi fi
switch2primary_check_replication $new_primary $new_secondary $res resource_check_replication $new_primary $new_secondary $res
return return
fi fi
@ -293,35 +293,5 @@ function switch2primary_correct_split_brain
$resource_maxtime_initial_sync \ $resource_maxtime_initial_sync \
$resource_time_constant_initial_sync \ $resource_time_constant_initial_sync \
"time_waited" "time_waited"
switch2primary_check_replication $new_primary $new_secondary $res resource_check_replication $new_primary $new_secondary $res
}
function switch2primary_check_replication
{
local primary_host=$1 secondary_host=$2 res=$3
local data_dev=$(resource_get_data_device $res)
lib_vmsg " check replication, primary=$primary_host, secondary=$secondary_host"
marsadm_do_cmd $primary_host "wait-resource" "$res is-device-on" || \
lib_exit 1
lib_vmsg " write some data to $primary_host:$data_dev"
local count=0 maxcount=3
while true; do
lib_remote_idfile $primary_host \
"yes | dd oflag=direct bs=4096 count=1 of=$data_dev" \
|| lib_exit 1
if [ $switch2primary_logrotate_new_primary -eq 0 ]; then
break
fi
marsadm_do_cmd $primary_host "log-rotate" $res || lib_exit 1
if [ $(($count % 2 )) -eq 0 ]; then
marsadm_do_cmd $primary_host "log-delete" $res || lib_exit 1
fi
let count+=1
if [ $count -eq $maxcount ]; then
break
fi
done
lib_wait_for_secondary_to_become_uptodate_and_cmp_cksums "resource" \
$new_secondary $primary_host \
$res $data_dev 0
} }