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

test_suite: remove leftovers of marsview

This commit is contained in:
Frank Liepold 2014-04-09 11:41:11 +02:00
parent a9e6c8583b
commit 6b2c1787f5
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_suite/mars/default-install_mars.conf
View File

@ -14,10 +14,6 @@
## root access without password request to each host is required.
## see also variable main_ssh_idfile_opt (default-main.conf)
## directory to copy contributed tools from
## (in general = checkout_mars_contrib_src_directory)
install_mars_contrib_src_directory="/home/fl/mars/mars-contrib"
## install_mars_method_list
##
## array containing provided methods to install mars on a given host.

2
test_suite/mars/default-marsview.conf
View File

@ -29,7 +29,7 @@ marsview_wait_for_state_time=10
marsview_replay_flag='R'
## the first line of marsview output contains state information to all
## the first line of marsvadm view-1and1 output contains state information to all
## relevant objects. The array marsview_object_to_field_list implements
## the reference from object to field number in the output line

3
test_suite/mars/modules/install_mars.sh
View File

@ -50,9 +50,6 @@ function install_mars_fill_userspace_target_dir_list
{
install_mars_userspace_target_dir_list=( \
["$checkout_mars_src_directory/userspace/marsadm"]="/usr/bin" \
["$install_mars_contrib_src_directory/bin/marsview"]="/usr/bin" \
["$install_mars_contrib_src_directory/lib/MARS/Resource.pm"]="/usr/share/perl5/MARS" \
["$install_mars_contrib_src_directory/lib/MARS.pm"]="/usr/share/perl5" \
)
}

4
test_suite/mars/modules/multires.sh
View File

@ -38,9 +38,9 @@ function multires_create_resources_all
local lv_dev=$(lv_config_get_lv_device $res)
marsadm_do_cmd $primary_host "create-resource --force" "$res $lv_dev"
marsadm_do_cmd $primary_host "wait-resource" "$res is-device"
lib_remote_idfile $primary_host marsview $res
lib_remote_idfile $primary_host marsadm view-1and1 $res
marsadm_do_cmd $secondary_host "join-resource --force" "$res $lv_dev"
lib_remote_idfile $secondary_host marsview $res
lib_remote_idfile $secondary_host marsadm view-1and1 $res
while true;do
if marsview_check $secondary_host $res "repl" "-S..-" \
&& marsview_check $secondary_host $res "disk" "Inconsistent"