this commit needs to be squashedfix test lvmplugin
This commit is contained in:
parent
dc575e9585
commit
54b2e4bb22
2 changed files with 57 additions and 57 deletions
|
|
@ -964,7 +964,7 @@ sub volume_underlay_resize {
|
|||
}
|
||||
|
||||
my $virtual_size = int($json_decode->{'virtual-size'} / 1024);
|
||||
syslog("info", "current qcow2 virtual size $virtual_size B\n");
|
||||
syslog("info", "current qcow2 virtual size $virtual_size KiB\n");
|
||||
|
||||
my $underlay_size = lv_size($path, 10);
|
||||
syslog("info", "current underlay size $underlay_size B\n ");
|
||||
|
|
|
|||
|
|
@ -156,62 +156,62 @@ $tests->{8} = $test8;
|
|||
my $test7 = sub {
|
||||
|
||||
print "\nrun test7 \"vdisk_alloc\"\n";
|
||||
#
|
||||
# eval {
|
||||
# my $tmp_volid =
|
||||
# PVE::Storage::vdisk_alloc($cfg, $storagename, "112", "raw", undef, 1024 * 1024);
|
||||
#
|
||||
# if ($tmp_volid ne "$storagename:vm-112-disk-0") {
|
||||
# die "volname:$tmp_volid don't match\n";
|
||||
# }
|
||||
# eval {
|
||||
# run_command(
|
||||
# "lvs --noheadings -o lv_size $vgname/vm-112-disk-0",
|
||||
# outfunc => sub {
|
||||
# my $tmp = shift;
|
||||
# if ($tmp !~ m/1\.00g/) {
|
||||
# die "size don't match\n";
|
||||
# }
|
||||
# },
|
||||
# );
|
||||
# };
|
||||
# if ($@) {
|
||||
# $count++;
|
||||
# warn "Test7 a: $@";
|
||||
# }
|
||||
# };
|
||||
# if ($@) {
|
||||
# $count++;
|
||||
# warn "Test7 a: $@";
|
||||
# }
|
||||
#
|
||||
# eval {
|
||||
# my $tmp_volid =
|
||||
# PVE::Storage::vdisk_alloc($cfg, $storagename, "112", "raw", undef, 2048 * 1024);
|
||||
#
|
||||
# if ($tmp_volid ne "$storagename:vm-112-disk-1") {
|
||||
# die "volname:$tmp_volid don't match\n";
|
||||
# }
|
||||
# eval {
|
||||
# run_command(
|
||||
# "lvs --noheadings -o lv_size $vgname/vm-112-disk-1",
|
||||
# outfunc => sub {
|
||||
# my $tmp = shift;
|
||||
# if ($tmp !~ m/2\.00g/) {
|
||||
# die "size don't match\n";
|
||||
# }
|
||||
# },
|
||||
# );
|
||||
# };
|
||||
# if ($@) {
|
||||
# $count++;
|
||||
# warn "Test7 b: $@";
|
||||
# }
|
||||
# };
|
||||
# if ($@) {
|
||||
# $count++;
|
||||
# warn "Test7 b: $@";
|
||||
# }
|
||||
|
||||
eval {
|
||||
my $tmp_volid =
|
||||
PVE::Storage::vdisk_alloc($cfg, $storagename, "112", "raw", undef, 1024 * 1024);
|
||||
|
||||
if ($tmp_volid ne "$storagename:vm-112-disk-0") {
|
||||
die "volname:$tmp_volid don't match\n";
|
||||
}
|
||||
eval {
|
||||
run_command(
|
||||
"lvs --noheadings -o lv_size $vgname/vm-112-disk-0",
|
||||
outfunc => sub {
|
||||
my $tmp = shift;
|
||||
if ($tmp !~ m/1\.00g/) {
|
||||
die "size don't match\n";
|
||||
}
|
||||
},
|
||||
);
|
||||
};
|
||||
if ($@) {
|
||||
$count++;
|
||||
warn "Test7 a: $@";
|
||||
}
|
||||
};
|
||||
if ($@) {
|
||||
$count++;
|
||||
warn "Test7 a: $@";
|
||||
}
|
||||
|
||||
eval {
|
||||
my $tmp_volid =
|
||||
PVE::Storage::vdisk_alloc($cfg, $storagename, "112", "raw", undef, 2048 * 1024);
|
||||
|
||||
if ($tmp_volid ne "$storagename:vm-112-disk-1") {
|
||||
die "volname:$tmp_volid don't match\n";
|
||||
}
|
||||
eval {
|
||||
run_command(
|
||||
"lvs --noheadings -o lv_size $vgname/vm-112-disk-1",
|
||||
outfunc => sub {
|
||||
my $tmp = shift;
|
||||
if ($tmp !~ m/2\.00g/) {
|
||||
die "size don't match\n";
|
||||
}
|
||||
},
|
||||
);
|
||||
};
|
||||
if ($@) {
|
||||
$count++;
|
||||
warn "Test7 b: $@";
|
||||
}
|
||||
};
|
||||
if ($@) {
|
||||
$count++;
|
||||
warn "Test7 b: $@";
|
||||
}
|
||||
|
||||
};
|
||||
$tests->{7} = $test7;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue