X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FStorage%2FLVMPlugin.pm;h=df49b765fb1eaa8162b1a48c1814ae0c2d2fc246;hb=342a56805c88aac1c7fa3ba6958b5e1e58cff08c;hp=845ebc563d03a3fb614e513478abac71f9cf8c1b;hpb=2c5a70971aad9c1a746bb88f53863ac2f0d1c6fc;p=pve-storage.git

diff --git a/PVE/Storage/LVMPlugin.pm b/PVE/Storage/LVMPlugin.pm
index 845ebc5..df49b76 100644
--- a/PVE/Storage/LVMPlugin.pm
+++ b/PVE/Storage/LVMPlugin.pm
@@ -2,7 +2,9 @@ package PVE::Storage::LVMPlugin;
 
 use strict;
 use warnings;
+
 use IO::File;
+
 use PVE::Tools qw(run_command trim);
 use PVE::Storage::Plugin;
 use PVE::JSONSchema qw(get_standard_option);
@@ -11,6 +13,15 @@ use base qw(PVE::Storage::Plugin);
 
 # lvm helper functions
 
+my $ignore_no_medium_warnings = sub {
+    my $line = shift;
+    # ignore those, most of the time they're from (virtual) IPMI/iKVM devices
+    # and just spam the log..
+    if ($line !~ /open failed: No medium found/) {
+	print STDERR "$line\n";
+    }
+};
+
 sub lvm_pv_info {
     my ($device) = @_;
 
@@ -38,12 +49,12 @@ sub lvm_pv_info {
 
 	my ($pvname, $size, $vgname, $uuid) = split(':', $line);
 
-	die "found multiple pvs entries for device '$device'\n" 
+	die "found multiple pvs entries for device '$device'\n"
 	    if $pvinfo;
 
 	$pvinfo = {
 	    pvname => $pvname,
-	    size => $size,
+	    size => int($size),
 	    vgname => $vgname,
 	    uuid => $uuid,
 	};
@@ -58,15 +69,15 @@ sub clear_first_sector {
     if (my $fh = IO::File->new($dev, "w")) {
 	my $buf = 0 x 512;
 	syswrite $fh, $buf;
-	$fh->close();	
+	$fh->close();
     }
 }
 
 sub lvm_create_volume_group {
     my ($device, $vgname, $shared) = @_;
-    
+
     my $res = lvm_pv_info($device);
-    
+
     if ($res->{vgname}) {
 	return if $res->{vgname} eq $vgname; # already created
 	die "device '$device' is already used by volume group '$res->{vgname}'\n";
@@ -83,26 +94,47 @@ sub lvm_create_volume_group {
     $cmd = ['/sbin/vgcreate', $vgname, $device];
     # push @$cmd, '-c', 'y' if $shared; # we do not use this yet
 
-    run_command($cmd, errmsg => "vgcreate $vgname $device error");
+    run_command($cmd, errmsg => "vgcreate $vgname $device error", errfunc => $ignore_no_medium_warnings, outfunc => $ignore_no_medium_warnings);
 }
 
 sub lvm_vgs {
+    my ($includepvs) = @_;
 
     my $cmd = ['/sbin/vgs', '--separator', ':', '--noheadings', '--units', 'b',
-	       '--unbuffered', '--nosuffix', '--options',
-	       'vg_name,vg_size,vg_free'];
+	       '--unbuffered', '--nosuffix', '--options'];
+
+    my $cols = [qw(vg_name vg_size vg_free lv_count)];
+
+    if ($includepvs) {
+	push @$cols, qw(pv_name pv_size pv_free);
+    }
+
+    push @$cmd, join(',', @$cols);
 
     my $vgs = {};
     eval {
 	run_command($cmd, outfunc => sub {
 	    my $line = shift;
-
 	    $line = trim($line);
 
-	    my ($name, $size, $free) = split (':', $line);
+	    my ($name, $size, $free, $lvcount, $pvname, $pvsize, $pvfree) = split (':', $line);
+
+	    $vgs->{$name} //= {
+		size => int ($size),
+		free => int ($free),
+		lvcount => int($lvcount)
+	    };
 
-	    $vgs->{$name} = { size => int ($size), free => int ($free) };
-        });
+	    if (defined($pvname) && defined($pvsize) && defined($pvfree)) {
+		push @{$vgs->{$name}->{pvs}}, {
+		    name => $pvname,
+		    size => int($pvsize),
+		    free => int($pvfree),
+		};
+	    }
+	},
+	errfunc => $ignore_no_medium_warnings,
+	);
     };
     my $err = $@;
 
@@ -113,12 +145,17 @@ sub lvm_vgs {
     return $vgs;
 }
 
-sub lvm_lvs {
+sub lvm_list_volumes {
     my ($vgname) = @_;
 
-    my $cmd = ['/sbin/lvs', '--separator', ':', '--noheadings', '--units', 'b',
-	       '--unbuffered', '--nosuffix', '--options',
-	       'vg_name,lv_name,lv_size,uuid,tags'];
+    my $option_list = 'vg_name,lv_name,lv_size,lv_attr,pool_lv,data_percent,metadata_percent,snap_percent,uuid,tags,metadata_size,time';
+
+    my $cmd = [
+	'/sbin/lvs', '--separator', ':', '--noheadings', '--units', 'b',
+	'--unbuffered', '--nosuffix',
+	'--config', 'report/time_format="%s"',
+	'--options', $option_list,
+    ];
 
     push @$cmd, $vgname if $vgname;
 
@@ -128,46 +165,37 @@ sub lvm_lvs {
 
 	$line = trim($line);
 
-	my ($vg, $name, $size, $uuid, $tags) = split(':', $line);
+	my ($vg_name, $lv_name, $lv_size, $lv_attr, $pool_lv, $data_percent, $meta_percent, $snap_percent, $uuid, $tags, $meta_size, $ctime) = split(':', $line);
+	return if !$vg_name;
+	return if !$lv_name;
 
-	return if $name !~ m/^vm-(\d+)-/;
-	my $nid = $1;
+	my $lv_type = substr($lv_attr, 0, 1);
 
-	my $owner;
-	foreach my $tag (split (/,/, $tags)) {
-	    if ($tag =~ m/^pve-vm-(\d+)$/) {
-		$owner = $1;
-		last;
-	    }
-	}
-	
-	if ($owner) {
-	    if ($owner ne $nid) {
-		warn "owner mismatch name = $name, owner = $owner\n";
-	    }
-   
-	    $lvs->{$vg}->{$name} = { format => 'raw', size => $size, 
-				     uuid => $uuid,  tags => $tags, 
-				     vmid => $owner };
+	my $d = {
+	    lv_size => int($lv_size),
+	    lv_type => $lv_type,
+	};
+	$d->{pool_lv} = $pool_lv if $pool_lv;
+	$d->{tags} = $tags if $tags;
+	$d->{ctime} = $ctime;
+
+	if ($lv_type eq 't') {
+	    $data_percent ||= 0;
+	    $meta_percent ||= 0;
+	    $snap_percent ||= 0;
+	    $d->{metadata_size} = int($meta_size);
+	    $d->{metadata_used} = int(($meta_percent * $meta_size)/100);
+	    $d->{used} = int(($data_percent * $lv_size)/100);
 	}
-    });
+	$lvs->{$vg_name}->{$lv_name} = $d;
+    },
+    errfunc => $ignore_no_medium_warnings,
+    );
 
     return $lvs;
 }
 
-# Configuration 
-
-PVE::JSONSchema::register_format('pve-storage-vgname', \&parse_lvm_name);
-sub parse_lvm_name {
-    my ($name, $noerr) = @_;
-
-    if ($name !~ m/^[a-z][a-z0-9\-\_\.]*[a-z0-9]$/i) {
-	return undef if $noerr;
-	die "lvm name '$name' contains illegal characters\n";
-    }
-
-    return $name;
-}
+# Configuration
 
 sub type {
     return 'lvm';
@@ -175,7 +203,7 @@ sub type {
 
 sub plugindata {
     return {
-	content => [ {images => 1}, { images => 1 }],
+	content => [ {images => 1, rootdir => 1}, { images => 1 }],
     };
 }
 
@@ -193,42 +221,79 @@ sub properties {
 	    description => "Zero-out data when removing LVs.",
 	    type => 'boolean',
 	},
+	saferemove_throughput => {
+	    description => "Wipe throughput (cstream -t parameter value).",
+	    type => 'string',
+	},
+	tagged_only => {
+	    description => "Only use logical volumes tagged with 'pve-vm-ID'.",
+	    type => 'boolean',
+	}
     };
 }
 
 sub options {
     return {
 	vgname => { fixed => 1 },
-        nodes => { optional => 1 },
+	nodes => { optional => 1 },
 	shared => { optional => 1 },
 	disable => { optional => 1 },
-        saferemove => { optional => 1 },
+	saferemove => { optional => 1 },
+	saferemove_throughput => { optional => 1 },
 	content => { optional => 1 },
-        base => { fixed => 1, optional => 1 },
+	base => { fixed => 1, optional => 1 },
+	tagged_only => { optional => 1 },
+	bwlimit => { optional => 1 },
     };
 }
 
 # Storage implementation
 
+sub on_add_hook {
+    my ($class, $storeid, $scfg, %param) = @_;
+
+    if (my $base = $scfg->{base}) {
+	my ($baseid, $volname) = PVE::Storage::parse_volume_id($base);
+
+	my $cfg = PVE::Storage::config();
+	my $basecfg = PVE::Storage::storage_config ($cfg, $baseid, 1);
+	die "base storage ID '$baseid' does not exist\n" if !$basecfg;
+
+	# we only support iscsi for now
+	die "unsupported base type '$basecfg->{type}'"
+	    if $basecfg->{type} ne 'iscsi';
+
+	my $path = PVE::Storage::path($cfg, $base);
+
+	PVE::Storage::activate_storage($cfg, $baseid);
+
+	lvm_create_volume_group($path, $scfg->{vgname}, $scfg->{shared});
+    }
+
+    return;
+}
+
 sub parse_volname {
     my ($class, $volname) = @_;
 
-    parse_lvm_name($volname);
+    PVE::Storage::Plugin::parse_lvm_name($volname);
 
     if ($volname =~ m/^(vm-(\d+)-\S+)$/) {
-	return ('images', $1, $2);
+	return ('images', $1, $2, undef, undef, undef, 'raw');
     }
 
     die "unable to parse lvm volume name '$volname'\n";
 }
 
-sub path {
-    my ($class, $scfg, $volname) = @_;
+sub filesystem_path {
+    my ($class, $scfg, $volname, $snapname) = @_;
+
+    die "lvm snapshot is not implemented"if defined($snapname);
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
     my $vg = $scfg->{vgname};
-    
+
     my $path = "/dev/$vg/$name";
 
     return wantarray ? ($path, $vmid, $vtype) : $path;
@@ -241,17 +306,45 @@ sub create_base {
 }
 
 sub clone_image {
-    my ($class, $scfg, $storeid, $volname, $vmid) = @_;
+    my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_;
 
     die "can't clone images in lvm storage\n";
 }
 
+sub find_free_diskname {
+    my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_;
+
+    my $vg = $scfg->{vgname};
+
+    my $lvs = lvm_list_volumes($vg);
+
+    my $disk_list = [ keys %{$lvs->{$vg}} ];
+
+    return PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $storeid, $vmid, undef, $scfg);
+}
+
+sub lvcreate {
+    my ($vg, $name, $size, $tags) = @_;
+
+    if ($size =~ m/\d$/) { # no unit is given
+	$size .= "k"; # default to kilobytes
+    }
+
+    my $cmd = ['/sbin/lvcreate', '-aly', '--size', $size, '--name', $name];
+    for my $tag (@$tags) {
+	push @$cmd, '--addtag', $tag;
+    }
+    push @$cmd, $vg;
+
+    run_command($cmd, errmsg => "lvcreate '$vg/$name' error");
+}
+
 sub alloc_image {
     my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_;
 
     die "unsupported format '$fmt'" if $fmt ne 'raw';
 
-    die "illegal name '$name' - sould be 'vm-$vmid-*'\n" 
+    die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
 	if  $name && $name !~ m/^vm-$vmid-/;
 
     my $vgs = lvm_vgs();
@@ -264,24 +357,10 @@ sub alloc_image {
 
     die "not enough free space ($free < $size)\n" if $free < $size;
 
-    if (!$name) {
-	my $lvs = lvm_lvs($vg);
-
-	for (my $i = 1; $i < 100; $i++) {
-	    my $tn = "vm-$vmid-disk-$i";
-	    if (!defined ($lvs->{$vg}->{$tn})) {
-		$name = $tn;
-		last;
-	    }
-	}
-    }
-
-    die "unable to allocate an image name for VM $vmid in storage '$storeid'\n"
+    $name = $class->find_free_diskname($storeid, $scfg, $vmid)
 	if !$name;
 
-    my $cmd = ['/sbin/lvcreate', '-aly', '--addtag', "pve-vm-$vmid", '--size', "${size}k", '--name', $name, $vg];
-
-    run_command($cmd, errmsg => "lvcreate '$vg/pve-vm-$vmid' error");
+    lvcreate($vg, $name, $size, ["pve-vm-$vmid"]);
 
     return $name;
 }
@@ -290,51 +369,85 @@ sub free_image {
     my ($class, $storeid, $scfg, $volname, $isBase) = @_;
 
     my $vg = $scfg->{vgname};
-    
+
     # we need to zero out LVM data for security reasons
     # and to allow thin provisioning
 
     my $zero_out_worker = sub {
-	print "zero-out data on image $volname\n";
-	my $cmd = ['dd', "if=/dev/zero", "of=/dev/$vg/del-$volname", "bs=1M"];
-	eval { run_command($cmd, errmsg => "zero out failed"); };
+	print "zero-out data on image $volname (/dev/$vg/del-$volname)\n";
+
+	# wipe throughput up to 10MB/s by default; may be overwritten with saferemove_throughput
+	my $throughput = '-10485760';
+	if ($scfg->{saferemove_throughput}) {
+		$throughput = $scfg->{saferemove_throughput};
+	}
+
+	my $cmd = [
+		'/usr/bin/cstream',
+		'-i', '/dev/zero',
+		'-o', "/dev/$vg/del-$volname",
+		'-T', '10',
+		'-v', '1',
+		'-b', '1048576',
+		'-t', "$throughput"
+	];
+	eval { run_command($cmd, errmsg => "zero out finished (note: 'No space left on device' is ok here)"); };
 	warn $@ if $@;
 
 	$class->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub {
 	    my $cmd = ['/sbin/lvremove', '-f', "$vg/del-$volname"];
 	    run_command($cmd, errmsg => "lvremove '$vg/del-$volname' error");
 	});
-	print "successfully removed volume $volname\n";
+	print "successfully removed volume $volname ($vg/del-$volname)\n";
     };
 
+    my $cmd = ['/sbin/lvchange', '-aly', "$vg/$volname"];
+    run_command($cmd, errmsg => "can't activate LV '$vg/$volname' to zero-out its data");
+    $cmd = ['/sbin/lvchange', '--refresh', "$vg/$volname"];
+    run_command($cmd, errmsg => "can't refresh LV '$vg/$volname' to zero-out its data");
+
     if ($scfg->{saferemove}) {
 	# avoid long running task, so we only rename here
-	my $cmd = ['/sbin/lvrename', $vg, $volname, "del-$volname"];
+	$cmd = ['/sbin/lvrename', $vg, $volname, "del-$volname"];
 	run_command($cmd, errmsg => "lvrename '$vg/$volname' error");
 	return $zero_out_worker;
     } else {
 	my $tmpvg = $scfg->{vgname};
-	my $cmd = ['/sbin/lvremove', '-f', "$tmpvg/$volname"];
+	$cmd = ['/sbin/lvremove', '-f', "$tmpvg/$volname"];
 	run_command($cmd, errmsg => "lvremove '$tmpvg/$volname' error");
     }
 
     return undef;
 }
 
+my $check_tags = sub {
+    my ($tags) = @_;
+
+    return defined($tags) && $tags =~ /(^|,)pve-vm-\d+(,|$)/;
+};
+
 sub list_images {
     my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_;
 
     my $vgname = $scfg->{vgname};
 
-    $cache->{lvs} = lvm_lvs() if !$cache->{lvs};
+    $cache->{lvs} = lvm_list_volumes() if !$cache->{lvs};
 
     my $res = [];
-    
+
     if (my $dat = $cache->{lvs}->{$vgname}) {
 
 	foreach my $volname (keys %$dat) {
 
-	    my $owner = $dat->{$volname}->{vmid};
+	    next if $volname !~ m/^vm-(\d+)-/;
+	    my $owner = $1;
+
+	    my $info = $dat->{$volname};
+
+	    next if $scfg->{tagged_only} && !&$check_tags($info->{tags});
+
+	    # Allow mirrored and RAID LVs
+	    next if $info->{lv_type} !~ m/^[-mMrR]$/;
 
 	    my $volid = "$storeid:$volname";
 
@@ -342,13 +455,13 @@ sub list_images {
 		my $found = grep { $_ eq $volid } @$vollist;
 		next if !$found;
 	    } else {
-		next if defined ($vmid) && ($owner ne $vmid);
+		next if defined($vmid) && ($owner ne $vmid);
 	    }
 
-	    my $info = $dat->{$volname};
-	    $info->{volid} = $volid;
-
-	    push @$res, $info;
+	    push @$res, {
+		volid => $volid, format => 'raw', size => $info->{lv_size}, vmid => $owner,
+		ctime => $info->{ctime},
+	    };
 	}
     }
 
@@ -362,12 +475,8 @@ sub status {
 
     my $vgname = $scfg->{vgname};
 
-    my $total = 0;
-    my $free = 0;
-    my $used = 0;
-
-    if (my $info = $cache->{vgs}->{$vgname}) {
-	return ($info->{size}, $info->{free}, $total - $free, 1);
+     if (my $info = $cache->{vgs}->{$vgname}) {
+	return ($info->{size}, $info->{free}, $info->{size} - $info->{free}, 1);
     }
 
     return undef;
@@ -380,7 +489,7 @@ sub activate_storage {
 
     # In LVM2, vgscans take place automatically;
     # this is just to be sure
-    if ($cache->{vgs} && !$cache->{vgscaned} && 
+    if ($cache->{vgs} && !$cache->{vgscaned} &&
 	!$cache->{vgs}->{$scfg->{vgname}}) {
 	$cache->{vgscaned} = 1;
 	my $cmd = ['/sbin/vgscan', '--ignorelockingfailure', '--mknodes'];
@@ -400,20 +509,22 @@ sub deactivate_storage {
 }
 
 sub activate_volume {
-    my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
-
-    my $path = $class->path($scfg, $volname);
+    my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
+    #fix me lvmchange is not provided on
+    my $path = $class->path($scfg, $volname, $snapname);
 
-    my $lvm_activate_mode = $exclusive ? 'ey' : 'ly';
+    my $lvm_activate_mode = 'ey';
 
     my $cmd = ['/sbin/lvchange', "-a$lvm_activate_mode", $path];
     run_command($cmd, errmsg => "can't activate LV '$path'");
+    $cmd = ['/sbin/lvchange', '--refresh', $path];
+    run_command($cmd, errmsg => "can't refresh LV '$path' for activation");
 }
 
 sub deactivate_volume {
-    my ($class, $storeid, $scfg, $volname, $cache) = @_;
+    my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
 
-    my $path = $class->path($scfg, $volname);
+    my $path = $class->path($scfg, $volname, $snapname);
     return if ! -b $path;
 
     my $cmd = ['/sbin/lvchange', '-aln', $path];
@@ -427,13 +538,31 @@ sub volume_resize {
 
     my $path = $class->path($scfg, $volname);
     my $cmd = ['/sbin/lvextend', '-L', $size, $path];
-    run_command($cmd, errmsg => "error resizing volume '$path'");
+
+    $class->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub {
+	run_command($cmd, errmsg => "error resizing volume '$path'");
+    });
 
     return 1;
 }
 
+sub volume_size_info {
+    my ($class, $scfg, $storeid, $volname, $timeout) = @_;
+    my $path = $class->filesystem_path($scfg, $volname);
+
+    my $cmd = ['/sbin/lvs', '--separator', ':', '--noheadings', '--units', 'b',
+	       '--unbuffered', '--nosuffix', '--options', 'lv_size', $path];
+
+    my $size;
+    run_command($cmd, timeout => $timeout, errmsg => "can't get size of '$path'",
+	outfunc => sub {
+	    $size = int(shift);
+    });
+    return wantarray ? ($size, 'raw', 0, undef) : $size;
+}
+
 sub volume_snapshot {
-    my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
+    my ($class, $scfg, $storeid, $volname, $snap) = @_;
 
     die "lvm snapshot is not implemented";
 }
@@ -471,4 +600,88 @@ sub volume_has_feature {
     return undef;
 }
 
+sub volume_export_formats {
+    my ($class, $scfg, $storeid, $volname, $snapshot, $base_snapshot, $with_snapshots) = @_;
+    return () if defined($snapshot); # lvm-thin only
+    return volume_import_formats($class, $scfg, $storeid, $volname, $base_snapshot, $with_snapshots);
+}
+
+sub volume_export {
+    my ($class, $scfg, $storeid, $fh, $volname, $format, $snapshot, $base_snapshot, $with_snapshots) = @_;
+    die "volume export format $format not available for $class\n"
+	if $format ne 'raw+size';
+    die "cannot export volumes together with their snapshots in $class\n"
+	if $with_snapshots;
+    die "cannot export a snapshot in $class\n" if defined($snapshot);
+    die "cannot export an incremental stream in $class\n" if defined($base_snapshot);
+    my $file = $class->path($scfg, $volname, $storeid);
+    my $size;
+    # should be faster than querying LVM, also checks for the device file's availability
+    run_command(['/sbin/blockdev', '--getsize64', $file], outfunc => sub {
+	my ($line) = @_;
+	die "unexpected output from /sbin/blockdev: $line\n" if $line !~ /^(\d+)$/;
+	$size = int($1);
+    });
+    PVE::Storage::Plugin::write_common_header($fh, $size);
+    run_command(['dd', "if=$file", "bs=64k"], output => '>&'.fileno($fh));
+}
+
+sub volume_import_formats {
+    my ($class, $scfg, $storeid, $volname, $base_snapshot, $with_snapshots) = @_;
+    return () if $with_snapshots; # not supported
+    return () if defined($base_snapshot); # not supported
+    return ('raw+size');
+}
+
+sub volume_import {
+    my ($class, $scfg, $storeid, $fh, $volname, $format, $base_snapshot, $with_snapshots, $allow_rename) = @_;
+    die "volume import format $format not available for $class\n"
+	if $format ne 'raw+size';
+    die "cannot import volumes together with their snapshots in $class\n"
+	if $with_snapshots;
+    die "cannot import an incremental stream in $class\n" if defined($base_snapshot);
+
+    my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $file_format) =
+	$class->parse_volname($volname);
+    die "cannot import format $format into a file of format $file_format\n"
+	if $file_format ne 'raw';
+
+    my $vg = $scfg->{vgname};
+    my $lvs = lvm_list_volumes($vg);
+    if ($lvs->{$vg}->{$volname}) {
+	die "volume $vg/$volname already exists\n" if !$allow_rename;
+	warn "volume $vg/$volname already exists - importing with a different name\n";
+	$name = undef;
+    }
+
+    my ($size) = PVE::Storage::Plugin::read_common_header($fh);
+    $size = int($size/1024);
+
+    eval {
+	my $allocname = $class->alloc_image($storeid, $scfg, $vmid, 'raw', $name, $size);
+	my $oldname = $volname;
+	$volname = $allocname;
+	if (defined($name) && $allocname ne $oldname) {
+	    die "internal error: unexpected allocated name: '$allocname' != '$oldname'\n";
+	}
+	my $file = $class->path($scfg, $volname, $storeid)
+	    or die "internal error: failed to get path to newly allocated volume $volname\n";
+
+	$class->volume_import_write($fh, $file);
+    };
+    if (my $err = $@) {
+	eval { $class->free_image($storeid, $scfg, $volname, 0) };
+	warn $@ if $@;
+	die $err;
+    }
+
+    return "$storeid:$volname";
+}
+
+sub volume_import_write {
+    my ($class, $input_fh, $output_file) = @_;
+    run_command(['dd', "of=$output_file", 'bs=64k'],
+	input => '<&'.fileno($input_fh));
+}
+
 1;