[DRBD-cvs] testing by lars; CTH: user defined lodev size now in unit...
drbd-user@lists.linbit.com
drbd-user@lists.linbit.com
Wed, 7 Jul 2004 10:56:31 +0200 (CEST)
DRBD CVS committal
Author : lars
Project : drbd
Module : testing
Dir : drbd/testing/CTH
Modified Files:
Tag: rel-0_7-branch
CTH_bash.helpers LGE_CTH.pm functions.sh generic_test.pl
uml-minna.conf
Log Message:
CTH: user defined lodev size now in units of KB.
bash version supports now setting of sync-group, too.
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/testing/CTH/Attic/CTH_bash.helpers,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -3 -r1.1.2.11 -r1.1.2.12
--- CTH_bash.helpers 17 Jun 2004 01:35:52 -0000 1.1.2.11
+++ CTH_bash.helpers 7 Jul 2004 08:56:26 -0000 1.1.2.12
@@ -1,5 +1,5 @@
#!/bin/bash -nv
-# $Id: CTH_bash.helpers,v 1.1.2.11 2004/06/17 01:35:52 lars Exp $
+# $Id: CTH_bash.helpers,v 1.1.2.12 2004/07/07 08:56:26 lars Exp $
#
# define some implicit magic
# so the definition of the DRBDs will be easier
@@ -21,8 +21,8 @@
H_Disk=(name Node real_dev usize)
Fmt_Link="\n#\t(%-8s %-15s %-6s)"
H_Link=(Node ip nic)
- Fmt_Drbd="(%-8s %-5s %6s %-8s %7s\n#\t %-8s %-15s %-24s %-8s\n#\t %-8s %-15s %-24s %-8s)"
- H_Drbd=(name minor port link usize
+ Fmt_Drbd="(%-8s %-5s %6s %-8s %7s %2s\n#\t %-8s %-15s %-24s %-8s\n#\t %-8s %-15s %-24s %-8s)"
+ H_Drbd=(name minor port link usize sync_group
left left_ip left_real_dev left_disk
right right_ip right_real_dev right_disk
conf)
@@ -82,7 +82,8 @@
port=$3
link=$4
USIZE=$5
- shift 5; left=$1 left_ip=$2 left_real_dev=$3 left_disk=$4
+ sync_group=$6
+ shift 6; left=$1 left_ip=$2 left_real_dev=$3 left_disk=$4
shift 4; right=$1 right_ip=$2 right_real_dev=$3 right_disk=$4
conf=$5
DEV=/dev/nb$minor
@@ -114,7 +115,7 @@
{
local name minor port left left_real_dev right right_real_dev link
local left_ip left_hostname left_disk
- local right_ip right_hostname right_disk conf usize
+ local right_ip right_hostname right_disk conf usize sync_group
name=$1
minor=$2
port=$3
@@ -124,6 +125,7 @@
right_real_dev=$7
link=$8
usize=$9
+ sync_group=${10:- 1}
left_ip=$(ip_of $link $left) || return
right_ip=$(ip_of $link $right) || return
@@ -132,10 +134,10 @@
let ID_DISK++
left_disk="Disk_$ID_DISK"
- eval "$left_disk=( $name $left $left_real_dev \"${usize:+$[usize+128]}\" )"
+ eval "$left_disk=( $name $left $left_real_dev \"${usize:+$[usize+128*1024]}\" )"
let ID_DISK++
right_disk="Disk_$ID_DISK"
- eval "$right_disk=( $name $right $right_real_dev \"${usize:+$[usize+128]}\" )"
+ eval "$right_disk=( $name $right $right_real_dev \"${usize:+$[usize+128*1024]}\" )"
# funny quoting with cat
conf=$(cat <<-___
@@ -168,8 +170,8 @@
}
syncer {
al-extents 257;
- group 1;
- rate 30M;
+ group $sync_group;
+ rate 100M;
}
startup {
degr-wfc-timeout 120;
@@ -185,6 +187,7 @@
$port
$link
\"$usize\"
+ $sync_group
$left
$left_ip
$left_real_dev
@@ -202,16 +205,16 @@
: ${DEV:?unknown device}
# we could exclude the meta data...
# RSIZE=$(fdisk -s $DEV)
- # USIZE=${USIZE:+$[(USIZE+128)*1024]}
- # (( USIZE <= RSIZE )) # assert USIZE <= RSIZE
+ # USIZE=${USIZE:+$[USIZE+128*1024]}
# : ${USIZE:=$RSIZE}
+ # (( USIZE <= RSIZE )) # assert USIZE <= RSIZE
# let "MLOC=USIZE-128*1024"
perl -e '
use Digest::MD5 "md5_hex";
$nr=0;
while (sysread(STDIN,$buf,4096)==4096) {
printf "%6d\t%s\n",$nr++,md5_hex($buf);
- '${USIZE:+"last if \$pos+=4 >= $USIZE*256;"}'
+ '${USIZE:+"last if \$nr >= $[USIZE/4];"}'
}; print "\nDEVICE_SIZE\t$nr\tblocks \@ 4KB\n"; ' < $DEV
}
@@ -286,14 +289,14 @@
{
local d=$1
disk_to_env $d
- on ${!node}: dmsetup_error name=$name dev=$real_dev blocks=${USIZE:+$[USIZE*1024]}
+ on ${!node}: dmsetup_error name=$name dev=$real_dev blocks=$USIZE
}
Heal_Disk()
{
local d=$1
disk_to_env $d
- on ${!node}: dmsetup_linear name=$name dev=$real_dev blocks=${USIZE:+$[USIZE*1024]}
+ on ${!node}: dmsetup_linear name=$name dev=$real_dev blocks=$USIZE
}
# initial boot
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/testing/CTH/Attic/LGE_CTH.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- LGE_CTH.pm 3 Jun 2004 10:00:08 -0000 1.1.2.2
+++ LGE_CTH.pm 7 Jul 2004 08:56:26 -0000 1.1.2.3
@@ -1,5 +1,5 @@
package LGE_CTH;
-# $Id: LGE_CTH.pm,v 1.1.2.2 2004/06/03 10:00:08 lars Exp $
+# $Id: LGE_CTH.pm,v 1.1.2.3 2004/07/07 08:56:26 lars Exp $
use strict;
use warnings;
use Carp;
@@ -94,7 +94,8 @@
my $pid = $_[0];
return unless pid_is_pending $pid;
my $cb = delete $pending_events{$pid};
- kill 'TERM' => $pid;
+ # kill 'TERM' => $pid;
+ kill -15 => $pid;
return undef if waitpid($pid,0) <= 0;
# die "THINKO" if $pid != waitpid ...
$cb->($?) if $cb;
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/testing/CTH/Attic/functions.sh,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -3 -r1.1.2.8 -r1.1.2.9
--- functions.sh 17 Jun 2004 01:35:52 -0000 1.1.2.8
+++ functions.sh 7 Jul 2004 08:56:26 -0000 1.1.2.9
@@ -1,6 +1,6 @@
#!/bin/bash
# vim: set foldmethod=marker nofoldenable :
-# $Id: functions.sh,v 1.1.2.8 2004/06/17 01:35:52 lars Exp $
+# $Id: functions.sh,v 1.1.2.9 2004/07/07 08:56:26 lars Exp $
#DEBUG="-vx"
#DEBUG="-v"
@@ -271,9 +271,9 @@
drbdadm dump $RES &>/dev/null
RSIZE=$(fdisk -s /dev/mapper/$NAME)
- USIZE=${USIZE:+$[(USIZE+128)*1024]}
- (( USIZE <= RSIZE )) # assert USIZE <= RSIZE
+ USIZE=${USIZE:+$[USIZE+128*1024]}
: ${USIZE:=$RSIZE}
+ (( USIZE <= RSIZE )) # assert USIZE <= RSIZE
let "MLOC=(USIZE & ~3) -128*1024"
echo -n "Wipeout GC and AL area on $HOSTNAME:$LO_DEV via /dev/mapper/$NAME for resource $RES"
# drbdadm down $RES
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/testing/CTH/Attic/generic_test.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- generic_test.pl 7 Jun 2004 10:16:39 -0000 1.1.2.3
+++ generic_test.pl 7 Jul 2004 08:56:26 -0000 1.1.2.4
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: generic_test.pl,v 1.1.2.3 2004/06/07 10:16:39 lars Exp $
+# $Id: generic_test.pl,v 1.1.2.4 2004/07/07 08:56:26 lars Exp $
use strict;
use warnings;
@@ -43,7 +43,7 @@
our (
$left,$right,$link,
- $r0, $r1, $fs0, $fs1,
+ $r0, $r1, $r2, $r3, $fs0, $fs1, $fs2, $fs3,
);
# CHANGE
@@ -70,8 +70,17 @@
new LGE_CTH::GenericTest {
fs => $fs1,
which => $test_name,
-};
+} if defined $fs1;
+
+new LGE_CTH::GenericTest {
+ fs => $fs2,
+ which => $test_name,
+} if defined $fs2;
+new LGE_CTH::GenericTest {
+ fs => $fs3,
+ which => $test_name,
+} if defined $fs3;
Run;
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/testing/CTH/Attic/uml-minna.conf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- uml-minna.conf 15 Jun 2004 08:41:02 -0000 1.1.2.3
+++ uml-minna.conf 7 Jul 2004 08:56:26 -0000 1.1.2.4
@@ -1,4 +1,4 @@
-# $Id: uml-minna.conf,v 1.1.2.3 2004/06/15 08:41:02 lars Exp $
+# $Id: uml-minna.conf,v 1.1.2.4 2004/07/07 08:56:26 lars Exp $
#
# Note that some of the settings here may be overridden in generic_test.pl
# or at the end of this file
@@ -32,7 +32,7 @@
# see the config_template in LGE_CTH/DRBD_Resource.pm
#
$r0 = new LGE_CTH::DRBD_Resource {
- # usize => 50,
+ # usize => 50*1024,
name => 'r0',
minor => 0,
link => $link,
@@ -71,7 +71,7 @@
};
$r1 = new LGE_CTH::DRBD_Resource {
- # usize => 50,
+ # usize => 50*1024,
name => 'r1',
minor => 1,
link => $link,