[DRBD-cvs] testing by lars; CTH: user defined lodev size now in unit...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : lars
Project : drbd
Module  : testing

Dir     : drbd/testing/CTH/LGE_CTH


Modified Files:
      Tag: rel-0_7-branch
	DRBD_Resource.pm Disk.pm 


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/LGE_CTH/Attic/DRBD_Resource.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
--- DRBD_Resource.pm	15 Jun 2004 08:41:02 -0000	1.1.2.2
+++ DRBD_Resource.pm	7 Jul 2004 08:56:26 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-# $Id: DRBD_Resource.pm,v 1.1.2.2 2004/06/15 08:41:02 lars Exp $
+# $Id: DRBD_Resource.pm,v 1.1.2.3 2004/07/07 08:56:26 lars Exp $
 package LGE_CTH::DRBD_ResourceInstance;
 use strict;
 use warnings;
@@ -198,7 +198,7 @@
 			name => $c->{name},
 			dev  => $lodev,
 			may_fail => \$n->{lo_may_fail},
-			usize => ($c->{usize} ? ($c->{usize}+128) : 0)
+			usize => ($c->{usize} ? ($c->{usize}+128*1024) : 0)
 		};
 		my $instance = new LGE_CTH::DRBD_ResourceInstance {
 			master_resource => $me,
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/testing/CTH/LGE_CTH/Attic/Disk.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
--- Disk.pm	15 Jun 2004 08:41:02 -0000	1.1.2.2
+++ Disk.pm	7 Jul 2004 08:56:26 -0000	1.1.2.3
@@ -1,5 +1,5 @@
 package LGE_CTH::Disk;
-# $Id: Disk.pm,v 1.1.2.2 2004/06/15 08:41:02 lars Exp $
+# $Id: Disk.pm,v 1.1.2.3 2004/07/07 08:56:26 lars Exp $
 
 use strict;
 use warnings;
@@ -83,7 +83,7 @@
 	my $me = shift;
 	my ($dev,$name,$node,$usize) = @{$me->{_config}}{qw(dev name node usize)};
 	my ($hostname,$admin_ip) = @{$node->{_config}}{qw(hostname admin_ip)};
-	my $blocks = $usize ? ( "blocks=" . ($usize*1024) ) : "";
+	my $blocks = $usize ? "blocks=$usize" : "";
 	my $cmd = "on $admin_ip: dmsetup_error name=$name dev=$dev $blocks\n";
 	$me->_generic_event("fail","down",$cmd);
 }
@@ -92,7 +92,7 @@
 	my $me = shift;
 	my ($dev,$name,$node,$usize) = @{$me->{_config}}{qw(dev name node usize)};
 	my ($hostname,$admin_ip) = @{$node->{_config}}{qw(hostname admin_ip)};
-	my $blocks = $usize ? ( "blocks=" . ($usize*1024) ) : "";
+	my $blocks = $usize ? "blocks=$usize" : "";
 	my $cmd = "on $admin_ip: dmsetup_linear name=$name dev=$dev $blocks\n";
 	$me->_generic_event("heal","up",$cmd);
 }
@@ -101,7 +101,7 @@
 	my $me = shift;
 	my ($dev,$name,$node,$usize) = @{$me->{_config}}{qw(dev name node usize)};
 	my ($hostname,$admin_ip) = @{$node->{_config}}{qw(hostname admin_ip)};
-	my $blocks = $usize ? ( "blocks=" . ($usize*1024) ) : "";
+	my $blocks = $usize ? "blocks=$usize" : "";
 	my $cmd;
 	if ($me->{_status}->{status} eq 'down') {
         	$cmd = "on $admin_ip: dmsetup_error name=$name dev=$dev $blocks\n";