X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FStorage.pm;h=7376dbf72348c2bbcd64d895363ac8097880985d;hb=c2fc9fbe1d6eaa6e190e4c80248d3434cb2f4f87;hp=b9ea42ae9716de87ec303540c4f862a942ce5763;hpb=89443394668456ccaba30f5db435a6ef4cded417;p=pve-storage.git

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index b9ea42a..7376dbf 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -7,6 +7,7 @@ use Data::Dumper;
 use POSIX;
 use IO::Select;
 use IO::File;
+use IO::Socket::IP;
 use File::Basename;
 use File::Path;
 use Cwd 'abs_path';
@@ -24,9 +25,10 @@ use PVE::Storage::DirPlugin;
 use PVE::Storage::LVMPlugin;
 use PVE::Storage::LvmThinPlugin;
 use PVE::Storage::NFSPlugin;
+use PVE::Storage::CIFSPlugin;
 use PVE::Storage::ISCSIPlugin;
 use PVE::Storage::RBDPlugin;
-use PVE::Storage::SheepdogPlugin;
+use PVE::Storage::CephFSPlugin;
 use PVE::Storage::ISCSIDirectPlugin;
 use PVE::Storage::GlusterfsPlugin;
 use PVE::Storage::ZFSPoolPlugin;
@@ -34,16 +36,21 @@ use PVE::Storage::ZFSPlugin;
 use PVE::Storage::DRBDPlugin;
 
 # Storage API version. Icrement it on changes in storage API interface.
-use constant APIVER => 1;
+use constant APIVER => 3;
+# Age is the number of versions we're backward compatible with.
+# This is like having 'current=APIVER' and age='APIAGE' in libtool,
+# see https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
+use constant APIAGE => 2;
 
 # load standard plugins
 PVE::Storage::DirPlugin->register();
 PVE::Storage::LVMPlugin->register();
 PVE::Storage::LvmThinPlugin->register();
 PVE::Storage::NFSPlugin->register();
+PVE::Storage::CIFSPlugin->register();
 PVE::Storage::ISCSIPlugin->register();
 PVE::Storage::RBDPlugin->register();
-PVE::Storage::SheepdogPlugin->register();
+PVE::Storage::CephFSPlugin->register();
 PVE::Storage::ISCSIDirectPlugin->register();
 PVE::Storage::GlusterfsPlugin->register();
 PVE::Storage::ZFSPoolPlugin->register();
@@ -60,18 +67,29 @@ if ( -d '/usr/share/perl5/PVE/Storage/Custom' ) {
 
 	eval {
 	    require $file;
+
+	    # Check perl interface:
+	    die "not derived from PVE::Storage::Plugin\n"
+		if !$modname->isa('PVE::Storage::Plugin');
+	    die "does not provide an api() method\n"
+		if !$modname->can('api');
+	    # Check storage API version and that file is really storage plugin.
+	    my $version = $modname->api();
+	    die "implements an API version newer than current ($version > " . APIVER . ")\n"
+		if $version > APIVER;
+	    my $min_version = (APIVER - APIAGE);
+	    die "API version too old, please update the plugin ($version < $min_version)\n"
+		if $version < $min_version;
+	    import $file;
+	    $modname->register();
+
+	    # If we got this far and the API version is not the same, make some
+	    # noise:
+	    warn "Plugin \"$modname\" is implementing an older storage API, an upgrade is recommended\n"
+		if $version != APIVER;
 	};
 	if ($@) {
-	    warn $@;
-	# Check storage API version and that file is really storage plugin.
-	} elsif ($modname->isa('PVE::Storage::Plugin') && $modname->can('api') && $modname->api() == APIVER) {
-            eval {
-	        import $file;
-	        $modname->register();
-            };
-            warn $@ if $@;
-	} else {
-	    warn "Error loading storage plugin \"$modname\" because of API version mismatch. Please, update it.\n"
+	    warn "Error loading storage plugin \"$modname\": $@";
 	}
     });
 }
@@ -144,6 +162,17 @@ sub storage_check_enabled {
     return storage_check_node($cfg, $storeid, $node, $noerr);
 }
 
+# storage_can_replicate:
+# return true if storage supports replication
+# (volumes alocated with vdisk_alloc() has replication feature)
+sub storage_can_replicate {
+    my ($cfg, $storeid, $format) = @_;
+
+    my $scfg = storage_config($cfg, $storeid);
+    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+    return $plugin->storage_can_replicate($scfg, $storeid, $format);
+}
+
 sub storage_ids {
     my ($cfg) = @_;
 
@@ -262,6 +291,22 @@ sub volume_has_feature {
     }
 }
 
+sub volume_snapshot_list {
+    my ($cfg, $volid) = @_;
+
+    my ($storeid, $volname) = parse_volume_id($volid, 1);
+    if ($storeid) {
+	my $scfg = storage_config($cfg, $storeid);
+	my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+	return $plugin->volume_snapshot_list($scfg, $storeid, $volname);
+    } elsif ($volid =~ m|^(/.+)$| && -e $volid) {
+	die "send file/device '$volid' is not possible\n";
+    } else {
+	die "unable to parse volume ID '$volid'\n";
+    }
+    # return an empty array if dataset does not exist.
+}
+
 sub get_image_dir {
     my ($cfg, $storeid, $vmid) = @_;
 
@@ -352,7 +397,8 @@ sub check_volume_access {
     if ($sid) {
 	my ($vtype, undef, $ownervm) = parse_volname($cfg, $volid);
 	if ($vtype eq 'iso' || $vtype eq 'vztmpl') {
-	    # we simply allow access
+	    # require at least read access to storage, (custom) templates/ISOs could be sensitive
+	    $rpcenv->check_any($user, "/storage/$sid", ['Datastore.AllocateSpace', 'Datastore.Audit']);
 	} elsif (defined($ownervm) && defined($vmid) && ($ownervm == $vmid)) {
 	    # we are owner - allow access
 	} elsif ($vtype eq 'backup' && $ownervm) {
@@ -508,7 +554,7 @@ sub abs_filesystem_path {
 }
 
 sub storage_migrate {
-    my ($cfg, $volid, $target_host, $target_storeid, $target_volname) = @_;
+    my ($cfg, $volid, $target_sshinfo, $target_storeid, $target_volname, $base_snapshot, $snapshot, $ratelimit_bps, $insecure, $with_snapshots, $logfunc) = @_;
 
     my ($storeid, $volname) = parse_volume_id($volid);
     $target_volname = $volname if !$target_volname;
@@ -522,142 +568,83 @@ sub storage_migrate {
 
     my $target_volid = "${target_storeid}:${target_volname}";
 
-    my $errstr = "unable to migrate '$volid' to '${target_volid}' on host '$target_host'";
-
-    my $sshoptions = "-o 'BatchMode=yes'";
-    my $ssh = "/usr/bin/ssh $sshoptions";
-
-    local $ENV{RSYNC_RSH} = $ssh;
-
-    # only implemented for file system based storage
-    if ($scfg->{path}) {
-	if ($tcfg->{path}) {
-
-	    my $src_plugin = PVE::Storage::Plugin->lookup($scfg->{type});
-	    my $dst_plugin = PVE::Storage::Plugin->lookup($tcfg->{type});
-	    my $src = $src_plugin->path($scfg, $volname, $storeid);
-	    my $dst = $dst_plugin->path($tcfg, $target_volname, $target_storeid);
-
-	    my $dirname = dirname($dst);
-
-	    if ($tcfg->{shared}) { # we can do a local copy
-
-		run_command(['/bin/mkdir', '-p', $dirname]);
-
-		run_command(['/bin/cp', $src, $dst]);
-
-	    } else {
-		run_command(['/usr/bin/ssh', "root\@${target_host}",
-			     '/bin/mkdir', '-p', $dirname]);
-
-		# we use rsync with --sparse, so we can't use --inplace,
-		# so we remove file on the target if it already exists to
-		# save space
-		my ($size, $format) = PVE::Storage::Plugin::file_size_info($src);
-		if ($format && ($format eq 'raw') && $size) {
-		    run_command(['/usr/bin/ssh', "root\@${target_host}",
-				 'rm', '-f', $dst],
-				outfunc => sub {});
-		}
-
-		my $cmd;
-		if ($format eq 'subvol') {
-		    $cmd = ['/usr/bin/rsync', '--progress', '-X', '-A', '--numeric-ids',
-			    '-aH', '--delete', '--no-whole-file', '--inplace',
-			    '--one-file-system', "$src/", "[root\@${target_host}]:$dst"];
-		} else {
-		    $cmd = ['/usr/bin/rsync', '--progress', '--sparse', '--whole-file',
-			    $src, "[root\@${target_host}]:$dst"];
-		}
+    my $target_ip = $target_sshinfo->{ip};
+    my $errstr = "unable to migrate '$volid' to '${target_volid}' on host '$target_sshinfo->{name}'";
 
-		my $percent = -1;
+    my $ssh = PVE::Cluster::ssh_info_to_command($target_sshinfo);
+    my $ssh_base = PVE::Cluster::ssh_info_to_command_base($target_sshinfo);
+    local $ENV{RSYNC_RSH} = PVE::Tools::cmd2string($ssh_base);
 
-		run_command($cmd, outfunc => sub {
-		    my $line = shift;
+    my @cstream = ([ '/usr/bin/cstream', '-t', $ratelimit_bps ])
+	if defined($ratelimit_bps);
 
-		    if ($line =~ m/^\s*(\d+\s+(\d+)%\s.*)$/) {
-			if ($2 > $percent) {
-			    $percent = $2;
-			    print "rsync status: $1\n";
-			    *STDOUT->flush();
-			}
-		    } else {
-			print "$line\n";
-			*STDOUT->flush();
-		    }
-		});
-	    }
-	} else {
-	    die "$errstr - target type '$tcfg->{type}' not implemented\n";
+    my $migration_snapshot;
+    if (!defined($snapshot)) {
+	if ($scfg->{type} eq 'zfspool') {
+	    $migration_snapshot = 1;
+	    $snapshot = '__migration__';
 	}
+    }
 
-    } elsif ($scfg->{type} eq 'zfspool') {
-
-	if ($tcfg->{type} eq 'zfspool') {
-
-	    die "$errstr - pool on target does not have the same name as on source!"
-		if $tcfg->{pool} ne $scfg->{pool};
-
-	    my (undef, $volname) = parse_volname($cfg, $volid);
+    my @formats = volume_transfer_formats($cfg, $volid, $volid, $snapshot, $base_snapshot, $with_snapshots);
+    die "cannot migrate from storage type '$scfg->{type}' to '$tcfg->{type}'\n" if !@formats;
+    my $format = $formats[0];
 
-	    my $zfspath = "$scfg->{pool}\/$volname";
+    my $import_fn = '-'; # let pvesm import read from stdin per default
+    if ($insecure) {
+	my $net = $target_sshinfo->{network} // $target_sshinfo->{ip};
+	$import_fn = "tcp://$net";
+    }
 
-	    my $snap = ['zfs', 'snapshot', "$zfspath\@__migration__"];
+    $with_snapshots = $with_snapshots ? 1 : 0; # sanitize for passing as cli parameter
+    my $send = ['pvesm', 'export', $volid, $format, '-', '-with-snapshots', $with_snapshots];
+    my $recv = [@$ssh, '--', 'pvesm', 'import', $volid, $format, $import_fn, '-with-snapshots', $with_snapshots];
+    if (defined($snapshot)) {
+	push @$send, '-snapshot', $snapshot
+    }
+    if ($migration_snapshot) {
+	push @$recv, '-delete-snapshot', $snapshot;
+    }
 
-	    my $send = [['zfs', 'send', '-Rpv', "$zfspath\@__migration__"], ['ssh', "root\@$target_host",
-			'zfs', 'recv', $zfspath]];
+    if (defined($base_snapshot)) {
+	# Check if the snapshot exists on the remote side:
+	push @$send, '-base', $base_snapshot;
+	push @$recv, '-base', $base_snapshot;
+    }
 
-	    my $destroy_target = ['ssh', "root\@$target_host", 'zfs', 'destroy', "$zfspath\@__migration__"];
- 	    run_command($snap);
-	    eval{
-		run_command($send);
-	    };
-	    my $err = $@;
-	    warn "zfs send/receive failed, cleaning up snapshot(s)..\n" if $err;
-	    eval { run_command(['zfs', 'destroy', "$zfspath\@__migration__"]); };
-	    warn "could not remove source snapshot: $@\n" if $@;
-	    eval { run_command($destroy_target); };
-	    warn "could not remove target snapshot: $@\n" if $@;
-	    die $err if $err;
-
- 	} else {
- 	    die "$errstr - target type $tcfg->{type} is not valid\n";
- 	}
-
-    } elsif ($scfg->{type} eq 'lvmthin' || $scfg->{type} eq 'lvm') {
-
-	if (($scfg->{type} eq $tcfg->{type}) &&
-	    ($tcfg->{type} eq 'lvmthin' || $tcfg->{type} eq 'lvm')) {
-
-	    my (undef, $volname, $vmid) = parse_volname($cfg, $volid);
-	    my $size = volume_size_info($cfg, $volid, 5);
-	    my $src = path($cfg, $volid);
-	    my $dst = path($cfg, $target_volid);
-
-	    run_command(['/usr/bin/ssh', "root\@${target_host}",
-			 'pvesm', 'alloc', $target_storeid, $vmid,
-			  $target_volname, int($size/1024)]);
-
-	    eval {
-		if ($tcfg->{type} eq 'lvmthin') {
-		    run_command([["dd", "if=$src", "bs=4k"],["/usr/bin/ssh", "root\@${target_host}",
-			      "dd", 'conv=sparse', "of=$dst", "bs=4k"]]);
-		} else {
-		    run_command([["dd", "if=$src", "bs=4k"],["/usr/bin/ssh", "root\@${target_host}",
-			      "dd", "of=$dst", "bs=4k"]]);
-		}
-	    };
-	    if (my $err = $@) {
-		run_command(['/usr/bin/ssh', "root\@${target_host}",
-			 'pvesm', 'free', $target_volid]);
-		die $err;
+    volume_snapshot($cfg, $volid, $snapshot) if $migration_snapshot;
+    eval {
+	if ($insecure) {
+	    open(my $info, '-|', @$recv)
+		or die "receive command failed: $!\n";
+	    my ($ip) = <$info> =~ /^($PVE::Tools::IPRE)$/ or die "no tunnel IP received\n";
+	    my ($port) = <$info> =~ /^(\d+)$/ or die "no tunnel port received\n";
+	    my $socket = IO::Socket::IP->new(PeerHost => $ip, PeerPort => $port, Type => SOCK_STREAM)
+		or die "failed to connect to tunnel at $ip:$port\n";
+	    # we won't be reading from the socket
+	    shutdown($socket, 0);
+	    run_command([$send, @cstream], output => '>&'.fileno($socket));
+	    # don't close the connection entirely otherwise the receiving end
+	    # might not get all buffered data (and fails with 'connection reset by peer')
+	    shutdown($socket, 1);
+	    1 while <$info>; # wait for the remote process to finish
+	    # now close the socket
+	    close($socket);
+	    if (!close($info)) { # does waitpid()
+		die "import failed: $!\n" if $!;
+		die "import failed: exit code ".($?>>8)."\n";
 	    }
 	} else {
-	    die "$errstr - migrate from source type '$scfg->{type}' to '$tcfg->{type}' not implemented\n";
+	    run_command([$send, @cstream, $recv], logfunc => $logfunc);
 	}
-    } else {
-	die "$errstr - source type '$scfg->{type}' not implemented\n";
+    };
+    my $err = $@;
+    warn "send/receive failed, cleaning up snapshot(s)..\n" if $err;
+    if ($migration_snapshot) {
+	eval { volume_snapshot_delete($cfg, $volid, $snapshot, 0) };
+	warn "could not remove source snapshot: $@\n" if $@;
     }
+    die $err if $err;
 }
 
 sub vdisk_clone {
@@ -696,6 +683,30 @@ sub vdisk_create_base {
     });
 }
 
+sub map_volume {
+    my ($cfg, $volid, $snapname) = @_;
+
+    my ($storeid, $volname) = parse_volume_id($volid);
+
+    my $scfg = storage_config($cfg, $storeid);
+
+    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+
+    return $plugin->map_volume($storeid, $scfg, $volname, $snapname);
+}
+
+sub unmap_volume {
+    my ($cfg, $volid, $snapname) = @_;
+
+    my ($storeid, $volname) = parse_volume_id($volid);
+
+    my $scfg = storage_config($cfg, $storeid);
+
+    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+
+    return $plugin->unmap_volume($storeid, $scfg, $volname, $snapname);
+}
+
 sub vdisk_alloc {
     my ($cfg, $storeid, $vmid, $fmt, $name, $size) = @_;
 
@@ -758,74 +769,6 @@ sub vdisk_free {
     $rpcenv->fork_worker('imgdel', undef, $authuser, $cleanup_worker);
 }
 
-#list iso or openvz template ($tt = <iso|vztmpl|backup>)
-sub template_list {
-    my ($cfg, $storeid, $tt) = @_;
-
-    die "unknown template type '$tt'\n"
-	if !($tt eq 'iso' || $tt eq 'vztmpl' || $tt eq 'backup');
-
-    my $ids = $cfg->{ids};
-
-    storage_check_enabled($cfg, $storeid) if ($storeid);
-
-    my $res = {};
-
-    # query the storage
-
-    foreach my $sid (keys %$ids) {
-	next if $storeid && $storeid ne $sid;
-
-	my $scfg = $ids->{$sid};
-	my $type = $scfg->{type};
-
-	next if !storage_check_enabled($cfg, $sid, undef, 1);
-
-	next if $tt eq 'iso' && !$scfg->{content}->{iso};
-	next if $tt eq 'vztmpl' && !$scfg->{content}->{vztmpl};
-	next if $tt eq 'backup' && !$scfg->{content}->{backup};
-
-	activate_storage($cfg, $sid);
-
-	if ($scfg->{path}) {
-	    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
-
-	    my $path = $plugin->get_subdir($scfg, $tt);
-
-	    foreach my $fn (<$path/*>) {
-
-		my $info;
-
-		if ($tt eq 'iso') {
-		    next if $fn !~ m!/([^/]+\.[Ii][Ss][Oo])$!;
-
-		    $info = { volid => "$sid:iso/$1", format => 'iso' };
-
-		} elsif ($tt eq 'vztmpl') {
-		    next if $fn !~ m!/([^/]+\.tar\.([gx]z))$!;
-
-		    $info = { volid => "$sid:vztmpl/$1", format => "t$2" };
-
-		} elsif ($tt eq 'backup') {
-		    next if $fn !~ m!/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!;
-
-		    $info = { volid => "$sid:backup/$1", format => $2 };
-		}
-
-		$info->{size} = -s $fn;
-
-		push @{$res->{$sid}}, $info;
-	    }
-
-	}
-
-	@{$res->{$sid}} = sort {lc($a->{volid}) cmp lc ($b->{volid}) } @{$res->{$sid}} if $res->{$sid};
-    }
-
-    return $res;
-}
-
-
 sub vdisk_list {
     my ($cfg, $storeid, $vmid, $vollist) = @_;
 
@@ -870,40 +813,53 @@ sub vdisk_list {
     return $res;
 }
 
+sub template_list {
+    my ($cfg, $storeid, $tt) = @_;
+
+    die "unknown template type '$tt'\n"
+	if !($tt eq 'iso' || $tt eq 'vztmpl' || $tt eq 'backup' || $tt eq 'snippets');
+
+    my $ids = $cfg->{ids};
+
+    storage_check_enabled($cfg, $storeid) if ($storeid);
+
+    my $res = {};
+
+    # query the storage
+    foreach my $sid (keys %$ids) {
+	next if $storeid && $storeid ne $sid;
+
+	my $scfg = $ids->{$sid};
+	my $type = $scfg->{type};
+
+	next if !$scfg->{content}->{$tt};
+
+	next if !storage_check_enabled($cfg, $sid, undef, 1);
+
+	$res->{$sid} = volume_list($cfg, $sid, undef, $tt);
+    }
+
+    return $res;
+}
+
 sub volume_list {
     my ($cfg, $storeid, $vmid, $content) = @_;
 
-    my @ctypes = qw(images vztmpl iso backup);
+    my @ctypes = qw(images vztmpl iso backup snippets);
 
     my $cts = $content ? [ $content ] : [ @ctypes ];
 
     my $scfg = PVE::Storage::storage_config($cfg, $storeid);
 
-    my $res = [];
-    foreach my $ct (@$cts) {
-	my $data;
-	if ($ct eq 'images') {
-	    $data = vdisk_list($cfg, $storeid, $vmid);
-	} elsif ($ct eq 'iso' && !defined($vmid)) {
-	    $data = template_list($cfg, $storeid, 'iso');
-	} elsif ($ct eq 'vztmpl'&& !defined($vmid)) {
-	    $data = template_list ($cfg, $storeid, 'vztmpl');
-	} elsif ($ct eq 'backup') {
-	    $data = template_list ($cfg, $storeid, 'backup');
-	    foreach my $item (@{$data->{$storeid}}) {
-		if (defined($vmid)) {
-		    @{$data->{$storeid}} = grep { $_->{volid} =~ m/\S+-$vmid-\S+/ } @{$data->{$storeid}};
-		}
-	    }
-	}
+    $cts = [ grep { defined($scfg->{content}->{$_}) } @$cts ];
 
-	next if !$data || !$data->{$storeid};
+    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
 
-	foreach my $item (@{$data->{$storeid}}) {
-	    $item->{content} = $ct;
-	    push @$res, $item;
-	}
-    }
+    activate_storage($cfg, $storeid);
+
+    my $res = $plugin->list_volumes($storeid, $scfg, $vmid, $cts);
+
+    @$res = sort {lc($a->{volid}) cmp lc ($b->{volid}) } @$res;
 
     return $res;
 }
@@ -1030,7 +986,7 @@ sub deactivate_volumes {
 }
 
 sub storage_info {
-    my ($cfg, $content) = @_;
+    my ($cfg, $content, $includeformat) = @_;
 
     my $ids = $cfg->{ids};
 
@@ -1040,8 +996,7 @@ sub storage_info {
 
     my $slist = [];
     foreach my $storeid (keys %$ids) {
-
-	next if !storage_check_enabled($cfg, $storeid, undef, 1);
+	my $storage_enabled = defined(storage_check_enabled($cfg, $storeid, undef, 1));
 
 	if (defined($content)) {
 	    my $want_ctype = 0;
@@ -1051,7 +1006,7 @@ sub storage_info {
 		    last;
 		}
 	    }
-	    next if !$want_ctype;
+	    next if !$want_ctype || !$storage_enabled;
 	}
 
 	my $type = $ids->{$storeid}->{type};
@@ -1064,6 +1019,7 @@ sub storage_info {
 	    shared => $ids->{$storeid}->{shared} ? 1 : 0,
 	    content => PVE::Storage::Plugin::content_hash_to_string($ids->{$storeid}->{content}),
 	    active => 0,
+	    enabled => $storage_enabled ? 1 : 0,
 	};
 
 	push @$slist, $storeid;
@@ -1073,7 +1029,18 @@ sub storage_info {
 
     foreach my $storeid (keys %$ids) {
 	my $scfg = $ids->{$storeid};
+
 	next if !$info->{$storeid};
+	next if !$info->{$storeid}->{enabled};
+
+	my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+	if ($includeformat) {
+	    my $pd = $plugin->plugindata();
+	    $info->{$storeid}->{format} = $pd->{format}
+		if $pd->{format};
+	    $info->{$storeid}->{select_existing} = $pd->{select_existing}
+		if $pd->{select_existing};
+	}
 
 	eval { activate_storage($cfg, $storeid, $cache); };
 	if (my $err = $@) {
@@ -1081,9 +1048,7 @@ sub storage_info {
 	    next;
 	}
 
-	my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
-	my ($total, $avail, $used, $active);
-	eval { ($total, $avail, $used, $active) = $plugin->status($storeid, $scfg, $cache); };
+	my ($total, $avail, $used, $active) = eval { $plugin->status($storeid, $scfg, $cache); };
 	warn $@ if $@;
 	next if !$active;
 	$info->{$storeid}->{total} = int($total);
@@ -1133,6 +1098,41 @@ sub scan_nfs {
     return $res;
 }
 
+sub scan_cifs {
+    my ($server_in, $user, $password, $domain) = @_;
+
+    my $server;
+    if (!($server = resolv_server ($server_in))) {
+	die "unable to resolve address for server '${server_in}'\n";
+    }
+
+    # we support only Windows grater than 2012 cifsscan so use smb3
+    my $cmd = ['/usr/bin/smbclient', '-m', 'smb3', '-d', '0', '-L', $server];
+    if (defined($user)) {
+	die "password is required" if !defined($password);
+	push @$cmd, '-U', "$user\%$password";
+	push @$cmd, '-W', $domain if defined($domain);
+    } else {
+	push @$cmd, '-N';
+    }
+
+    my $res = {};
+    run_command($cmd,
+		outfunc => sub {
+		    my $line = shift;
+		    if ($line =~ m/(\S+)\s*Disk\s*(\S*)/) {
+			$res->{$1} = $2;
+		    } elsif ($line =~ m/(NT_STATUS_(\S*))/) {
+			$res->{$1} = '';
+		    }
+		},
+		errfunc => sub {},
+		noerr => 1
+    );
+
+    return $res;
+}
+
 sub scan_zfs {
 
     my $cmd = ['zfs',  'list', '-t', 'filesystem', '-H', '-o', 'name,avail,used'];
@@ -1171,62 +1171,6 @@ sub resolv_portal {
     raise_param_exc({ portal => "unable to resolve portal address '$portal'" });
 }
 
-# idea is from usbutils package (/usr/bin/usb-devices) script
-sub __scan_usb_device {
-    my ($res, $devpath, $parent, $level) = @_;
-
-    return if ! -d $devpath;
-    return if $level && $devpath !~ m/^.*[-.](\d+)$/;
-    my $port = $level ? int($1 - 1) : 0;
-
-    my $busnum = int(file_read_firstline("$devpath/busnum"));
-    my $devnum = int(file_read_firstline("$devpath/devnum"));
-
-    my $d = {
-	port => $port,
-	level => $level,
-	busnum => $busnum,
-	devnum => $devnum,
-	speed => file_read_firstline("$devpath/speed"),
-	class => hex(file_read_firstline("$devpath/bDeviceClass")),
-	vendid => file_read_firstline("$devpath/idVendor"),
-	prodid => file_read_firstline("$devpath/idProduct"),
-    };
-
-    if ($level) {
-	my $usbpath = $devpath;
-	$usbpath =~ s|^.*/\d+\-||;
-	$d->{usbpath} = $usbpath;
-    }
-
-    my $product = file_read_firstline("$devpath/product");
-    $d->{product} = $product if $product;
-
-    my $manu = file_read_firstline("$devpath/manufacturer");
-    $d->{manufacturer} = $manu if $manu;
-
-    my $serial => file_read_firstline("$devpath/serial");
-    $d->{serial} = $serial if $serial;
-
-    push @$res, $d;
-
-    foreach my $subdev (<$devpath/$busnum-*>) {
-	next if $subdev !~ m|/$busnum-[0-9]+(\.[0-9]+)*$|;
-	__scan_usb_device($res, $subdev, $devnum, $level + 1);
-    }
-
-};
-
-sub scan_usb {
-
-    my $devlist = [];
-
-    foreach my $device (</sys/bus/usb/devices/usb*>) {
-	__scan_usb_device($devlist, $device, 0, 0);
-    }
-
-    return $devlist;
-}
 
 sub scan_iscsi {
     my ($portal_in) = @_;
@@ -1327,7 +1271,7 @@ sub extract_vzdump_config_tar {
 
     my $file;
     while (defined($file = <$fh>)) {
-	if ($file =~ m!$conf_re!) {
+	if ($file =~ $conf_re) {
 	    $file = $1; # untaint
 	    last;
 	}
@@ -1395,7 +1339,7 @@ sub extract_vzdump_config_vma {
 	my $rerr = $@;
 
 	# use exit code if no stderr output and not just broken pipe
-	if (!$errstring && !$broken_pipe && $rc > 0 && $rc != 141) {
+	if (!$errstring && !$broken_pipe && $rc != 0 && $rc != 141) {
 	    die "$rerr\n" if $rerr;
 	    die "config extraction failed with exit code $rc\n";
 	}
@@ -1414,7 +1358,7 @@ sub extract_vzdump_config {
     my $archive = abs_filesystem_path($cfg, $volid);
 
     if ($volid =~ /vzdump-(lxc|openvz)-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|(tar(\.(gz|lzo))?))$/) {
-	return extract_vzdump_config_tar($archive,'^(\./etc/vzdump/(pct|vps)\.conf)$');
+	return extract_vzdump_config_tar($archive, qr!^(\./etc/vzdump/(pct|vps)\.conf)$!);
     } elsif ($volid =~ /vzdump-qemu-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(gz|lzo))?))$/) {
 	my $format;
 	my $comp;
@@ -1436,6 +1380,60 @@ sub extract_vzdump_config {
     }
 }
 
+sub volume_export {
+    my ($cfg, $fh, $volid, $format, $snapshot, $base_snapshot, $with_snapshots) = @_;
+
+    my ($storeid, $volname) = parse_volume_id($volid, 1);
+    die "cannot export volume '$volid'\n" if !$storeid;
+    my $scfg = storage_config($cfg, $storeid);
+    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+    return $plugin->volume_export($scfg, $storeid, $fh, $volname, $format,
+                                  $snapshot, $base_snapshot, $with_snapshots);
+}
+
+sub volume_import {
+    my ($cfg, $fh, $volid, $format, $base_snapshot, $with_snapshots) = @_;
+
+    my ($storeid, $volname) = parse_volume_id($volid, 1);
+    die "cannot import into volume '$volid'\n" if !$storeid;
+    my $scfg = storage_config($cfg, $storeid);
+    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+    return $plugin->volume_import($scfg, $storeid, $fh, $volname, $format,
+                                  $base_snapshot, $with_snapshots);
+}
+
+sub volume_export_formats {
+    my ($cfg, $volid, $snapshot, $base_snapshot, $with_snapshots) = @_;
+
+    my ($storeid, $volname) = parse_volume_id($volid, 1);
+    return if !$storeid;
+    my $scfg = storage_config($cfg, $storeid);
+    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+    return $plugin->volume_export_formats($scfg, $storeid, $volname,
+                                          $snapshot, $base_snapshot,
+                                          $with_snapshots);
+}
+
+sub volume_import_formats {
+    my ($cfg, $volid, $base_snapshot, $with_snapshots) = @_;
+
+    my ($storeid, $volname) = parse_volume_id($volid, 1);
+    return if !$storeid;
+    my $scfg = storage_config($cfg, $storeid);
+    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+    return $plugin->volume_import_formats($scfg, $storeid, $volname,
+                                          $base_snapshot, $with_snapshots);
+}
+
+sub volume_transfer_formats {
+    my ($cfg, $src_volid, $dst_volid, $snapshot, $base_snapshot, $with_snapshots) = @_;
+    my @export_formats = volume_export_formats($cfg, $src_volid, $snapshot, $base_snapshot, $with_snapshots);
+    my @import_formats = volume_import_formats($cfg, $dst_volid, $base_snapshot, $with_snapshots);
+    my %import_hash = map { $_ => 1 } @import_formats;
+    my @common = grep { $import_hash{$_} } @export_formats;
+    return @common;
+}
+
 # bash completion helper
 
 sub complete_storage {
@@ -1462,7 +1460,7 @@ sub complete_storage_enabled {
 sub complete_content_type {
     my ($cmdname, $pname, $cvalue) = @_;
 
-    return [qw(rootdir images vztmpl iso backup)];
+    return [qw(rootdir images vztmpl iso backup snippets)];
 }
 
 sub complete_volume {
@@ -1499,4 +1497,92 @@ sub complete_volume {
     return $res;
 }
 
+# Various io-heavy operations require io/bandwidth limits which can be
+# configured on multiple levels: The global defaults in datacenter.cfg, and
+# per-storage overrides. When we want to do a restore from storage A to storage
+# B, we should take the smaller limit defined for storages A and B, and if no
+# such limit was specified, use the one from datacenter.cfg.
+sub get_bandwidth_limit {
+    my ($operation, $storage_list, $override) = @_;
+
+    # called for each limit (global, per-storage) with the 'default' and the
+    # $operation limit and should udpate $override for every limit affecting
+    # us.
+    my $use_global_limits = 0;
+    my $apply_limit = sub {
+	my ($bwlimit) = @_;
+	if (defined($bwlimit)) {
+	    my $limits = PVE::JSONSchema::parse_property_string('bwlimit', $bwlimit);
+	    my $limit = $limits->{$operation} // $limits->{default};
+	    if (defined($limit)) {
+		if (!$override || $limit < $override) {
+		    $override = $limit;
+		}
+		return;
+	    }
+	}
+	# If there was no applicable limit, try to apply the global ones.
+	$use_global_limits = 1;
+    };
+
+    my ($rpcenv, $authuser);
+    if (defined($override)) {
+	$rpcenv = PVE::RPCEnvironment->get();
+	$authuser = $rpcenv->get_user();
+    }
+
+    # Apply per-storage limits - if there are storages involved.
+    if (defined($storage_list) && @$storage_list) {
+	my $config = config();
+
+	# The Datastore.Allocate permission allows us to modify the per-storage
+	# limits, therefore it also allows us to override them.
+	# Since we have most likely multiple storages to check, do a quick check on
+	# the general '/storage' path to see if we can skip the checks entirely:
+	return $override if $rpcenv && $rpcenv->check($authuser, '/storage', ['Datastore.Allocate'], 1);
+
+	my %done;
+	foreach my $storage (@$storage_list) {
+	    next if !defined($storage);
+	    # Avoid duplicate checks:
+	    next if $done{$storage};
+	    $done{$storage} = 1;
+
+	    # Otherwise we may still have individual /storage/$ID permissions:
+	    if (!$rpcenv || !$rpcenv->check($authuser, "/storage/$storage", ['Datastore.Allocate'], 1)) {
+		# And if not: apply the limits.
+		my $storecfg = storage_config($config, $storage);
+		$apply_limit->($storecfg->{bwlimit});
+	    }
+	}
+
+	# Storage limits take precedence over the datacenter defaults, so if
+	# a limit was applied:
+	return $override if !$use_global_limits;
+    }
+
+    # Sys.Modify on '/' means we can change datacenter.cfg which contains the
+    # global default limits.
+    if (!$rpcenv || !$rpcenv->check($authuser, '/', ['Sys.Modify'], 1)) {
+	# So if we cannot modify global limits, apply them to our currently
+	# requested override.
+	my $dc = cfs_read_file('datacenter.cfg');
+	$apply_limit->($dc->{bwlimit});
+    }
+
+    return $override;
+}
+
+# checks if the storage id is available and dies if not
+sub assert_sid_unused {
+    my ($sid) = @_;
+
+    my $cfg = config();
+    if (my $scfg = storage_config($cfg, $sid, 1)) {
+	die "storage ID '$sid' already defined\n";
+    }
+
+    return undef;
+}
+
 1;