X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FStorage%2FGlusterfsPlugin.pm;h=5ec2f42e8d802a972fb53807b5ec689b98e0f711;hb=9177cc2eda87c9a8f85a5ba73fa5f8e45cdd44de;hp=93d1509d4fc471a6dbe5079970a93803221e79ea;hpb=f4648aef06ab86f3a5269403786df75571cba541;p=pve-storage.git

diff --git a/PVE/Storage/GlusterfsPlugin.pm b/PVE/Storage/GlusterfsPlugin.pm
index 93d1509..5ec2f42 100644
--- a/PVE/Storage/GlusterfsPlugin.pm
+++ b/PVE/Storage/GlusterfsPlugin.pm
@@ -5,38 +5,77 @@ use warnings;
 use IO::File;
 use File::Path;
 use PVE::Tools qw(run_command);
+use PVE::ProcFSTools;
+use PVE::Network;
 use PVE::Storage::Plugin;
 use PVE::JSONSchema qw(get_standard_option);
-use Net::Ping;
 
 use base qw(PVE::Storage::Plugin);
 
 # Glusterfs helper functions
 
-sub read_proc_mounts {
-    
-    local $/; # enable slurp mode
-    
-    my $data = "";
-    if (my $fd = IO::File->new("/proc/mounts", "r")) {
-	$data = <$fd>;
-	close ($fd);
+my $server_test_results = {};
+
+my $get_active_server = sub {
+    my ($scfg, $return_default_if_offline) = @_;
+
+    my $defaultserver = $scfg->{server} ? $scfg->{server} : 'localhost';
+
+    if ($return_default_if_offline && !defined($scfg->{server2})) {
+	# avoid delays (there is no backup server anyways)
+	return $defaultserver;
     }
 
-    return $data;
-}
+    my $serverlist = [ $defaultserver ];
+    push @$serverlist, $scfg->{server2} if $scfg->{server2};
 
-sub glusterfs_is_mounted {
-    my ($server, $volume, $mountpoint, $mountdata) = @_;
+    my $ctime = time();
+    foreach my $server (@$serverlist) {
+	my $stat = $server_test_results->{$server};
+	return $server if $stat && $stat->{active} && (($ctime - $stat->{time}) <= 2); 
+    }
 
-    my $source = "$server:$volume";
+    foreach my $server (@$serverlist) {
+	my $status = 0;
+
+	if ($server && $server ne 'localhost' && $server ne '127.0.0.1' && $server ne '::1') {
+	    # ping the gluster daemon default port (24007) as heuristic
+	    $status = PVE::Network::tcp_ping($server, 24007, 2);
+
+	} else {
+
+	    my $parser = sub {
+		my $line = shift;
 
-    $mountdata = read_proc_mounts() if !$mountdata;
+		if ($line =~ m/Status: Started$/) {
+		    $status = 1;
+		}
+	    };
 
-    if ($mountdata =~ m|^$source/?\s$mountpoint\sfuse.glusterfs|m) {
-	return $mountpoint;
-    } 
+	    my $cmd = ['/usr/sbin/gluster', 'volume', 'info', $scfg->{volume}];
 
+	    run_command($cmd, errmsg => "glusterfs error", errfunc => sub {}, outfunc => $parser);
+	}
+
+	$server_test_results->{$server} = { time => time(), active => $status };
+	return $server if $status;
+    }
+
+    return $defaultserver if $return_default_if_offline;
+
+    return undef;
+};
+
+sub glusterfs_is_mounted {
+    my ($volume, $mountpoint, $mountdata) = @_;
+
+    $mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
+
+    return $mountpoint if grep {
+	$_->[2] eq 'fuse.glusterfs' &&
+	$_->[0] =~ /^\S+:\Q$volume\E$/ &&
+	$_->[1] eq $mountpoint
+    } @$mountdata;
     return undef;
 }
 
@@ -58,11 +97,11 @@ sub type {
 
 sub plugindata {
     return {
-	content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1},
+	content => [ { images => 1, vztmpl => 1, iso => 1, backup => 1, snippets => 1},
 		     { images => 1 }],
 	format => [ { raw => 1, qcow2 => 1, vmdk => 1 } , 'raw' ],
     };
-}   
+}
 
 sub properties {
     return {
@@ -70,6 +109,16 @@ sub properties {
 	    description => "Glusterfs Volume.",
 	    type => 'string',
 	},
+	server2 => {
+	    description => "Backup volfile server IP or DNS name.",
+	    type => 'string', format => 'pve-storage-server',
+	    requires => 'server',
+	},
+	transport => {
+	    description => "Gluster transport: tcp or rdma",
+	    type => 'string',
+	    enum => ['tcp', 'rdma', 'unix'],
+    	},
     };
 }
 
@@ -77,12 +126,17 @@ sub options {
     return {
 	path => { fixed => 1 },
 	server => { optional => 1 },
+	server2 => { optional => 1 },
 	volume => { fixed => 1 },
-        nodes => { optional => 1 },
+	transport => { optional => 1 },
+	nodes => { optional => 1 },
 	disable => { optional => 1 },
-        maxfiles => { optional => 1 },
+	maxfiles => { optional => 1 },
+	'prune-backups' => { optional => 1 },
 	content => { optional => 1 },
 	format => { optional => 1 },
+	mkdir => { optional => 1 },
+	bwlimit => { optional => 1 },
     };
 }
 
@@ -97,37 +151,140 @@ sub check_config {
 
 # Storage implementation
 
+sub parse_name_dir {
+    my $name = shift;
+
+    if ($name =~ m!^((base-)?[^/\s]+\.(raw|qcow2|vmdk))$!) {
+        return ($1, $3, $2);
+    }
+
+    die "unable to parse volume filename '$name'\n";
+}
+
 sub path {
-    my ($class, $scfg, $volname, $storeid) = @_;
+    my ($class, $scfg, $volname, $storeid, $snapname) = @_;
 
-    my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+    my ($vtype, $name, $vmid, undef, undef, $isBase, $format) =
+	$class->parse_volname($volname);
 
-    my $server = $scfg->{server} ? $scfg->{server} : 'localhost';
-    my $glustervolume = $scfg->{volume};
+    # Note: qcow2/qed has internal snapshot, so path is always
+    # the same (with or without snapshot => same file).
+    die "can't snapshot this image format\n" 
+	if defined($snapname) && $format !~ m/^(qcow2|qed)$/;
 
     my $path = undef;
-    if($vtype eq 'images'){
-	$path = "gluster://$server/$glustervolume/images/$vmid/$name";
-    }else{
+    if ($vtype eq 'images') {
+
+	my $server = &$get_active_server($scfg, 1);
+	my $glustervolume = $scfg->{volume};
+	my $transport = $scfg->{transport};
+	my $protocol = "gluster";
+
+	if ($transport) {
+	    $protocol = "gluster+$transport";
+	}
+
+	$path = "$protocol://$server/$glustervolume/images/$vmid/$name";
+
+    } else {
 	my $dir = $class->get_subdir($scfg, $vtype);
 	$path = "$dir/$name";
     }
 
-
     return wantarray ? ($path, $vmid, $vtype) : $path;
 }
 
+sub clone_image {
+    my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_;
+
+    die "storage definintion has no path\n" if !$scfg->{path};
+
+    my ($vtype, $basename, $basevmid, undef, undef, $isBase, $format) =
+	$class->parse_volname($volname);
+
+    die "clone_image on wrong vtype '$vtype'\n" if $vtype ne 'images';
+
+    die "this storage type does not support clone_image on snapshot\n" if $snap;
+
+    die "this storage type does not support clone_image on subvolumes\n" if $format eq 'subvol';
+
+    die "clone_image only works on base images\n" if !$isBase;
+
+    my $imagedir = $class->get_subdir($scfg, 'images');
+    $imagedir .= "/$vmid";
+
+    mkpath $imagedir;
+
+    my $name = $class->find_free_diskname($imagedir, $scfg, $vmid, "qcow2", 1);
+
+    warn "clone $volname: $vtype, $name, $vmid to $name (base=../$basevmid/$basename)\n";
+
+    my $path = "$imagedir/$name";
+
+    die "disk image '$path' already exists\n" if -e $path;
+
+    my $server = &$get_active_server($scfg, 1);
+    my $glustervolume = $scfg->{volume};
+    my $volumepath = "gluster://$server/$glustervolume/images/$vmid/$name";
+
+    my $cmd = ['/usr/bin/qemu-img', 'create', '-b', "../$basevmid/$basename",
+	       '-F', $format, '-f', 'qcow2', $volumepath];
+
+    run_command($cmd, errmsg => "unable to create image");
+
+    return "$basevmid/$basename/$vmid/$name";
+}
+
+sub alloc_image {
+    my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_;
+
+    my $imagedir = $class->get_subdir($scfg, 'images');
+    $imagedir .= "/$vmid";
+
+    mkpath $imagedir;
+
+    $name = $class->find_free_diskname($imagedir, $scfg, $vmid, $fmt, 1) if !$name;
+
+    my (undef, $tmpfmt) = parse_name_dir($name);
+
+    die "illegal name '$name' - wrong extension for format ('$tmpfmt != '$fmt')\n"
+        if $tmpfmt ne $fmt;
+
+    my $path = "$imagedir/$name";
+
+    die "disk image '$path' already exists\n" if -e $path;
+
+    my $server = &$get_active_server($scfg, 1);
+    my $glustervolume = $scfg->{volume};
+    my $volumepath = "gluster://$server/$glustervolume/images/$vmid/$name";
+
+    my $cmd = ['/usr/bin/qemu-img', 'create'];
+
+    push @$cmd, '-o', 'preallocation=metadata' if $fmt eq 'qcow2';
+
+    push @$cmd, '-f', $fmt, $volumepath, "${size}K";
+
+    eval { run_command($cmd, errmsg => "unable to create image"); };
+    if ($@) {
+	unlink $path;
+	rmdir $imagedir;
+	die "$@";
+    }
+
+    return "$vmid/$name";
+}
+
 sub status {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+	if !$cache->{mountdata};
 
     my $path = $scfg->{path};
-    my $server = $scfg->{server} ? $scfg->{server} : 'localhost';
 
     my $volume = $scfg->{volume};
 
-    return undef if !glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata}); 
+    return undef if !glusterfs_is_mounted($volume, $path, $cache->{mountdata});
 
     return $class->SUPER::status($storeid, $scfg, $cache);
 }
@@ -135,20 +292,22 @@ sub status {
 sub activate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+	if !$cache->{mountdata};
 
     my $path = $scfg->{path};
-    my $server = $scfg->{server} ? $scfg->{server} : 'localhost';
     my $volume = $scfg->{volume};
 
-    if (!glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata})) {    
-		    
-	mkpath $path;
+    if (!glusterfs_is_mounted($volume, $path, $cache->{mountdata})) {
+	
+	mkpath $path if !(defined($scfg->{mkdir}) && !$scfg->{mkdir});
 
 	die "unable to activate storage '$storeid' - " .
 	    "directory '$path' does not exist\n" if ! -d $path;
 
-	glusterfs_mount($server, $volume, $path, $scfg->{options});
+	my $server = &$get_active_server($scfg, 1);
+
+	glusterfs_mount($server, $volume, $path);
     }
 
     $class->SUPER::activate_storage($storeid, $scfg, $cache);
@@ -157,58 +316,36 @@ sub activate_storage {
 sub deactivate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+	if !$cache->{mountdata};
 
     my $path = $scfg->{path};
-    my $server = $scfg->{server} ? $scfg->{server} : 'localhost';
     my $volume = $scfg->{volume};
 
-    if (glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata})) {    
+    if (glusterfs_is_mounted($volume, $path, $cache->{mountdata})) {
 	my $cmd = ['/bin/umount', $path];
-	run_command($cmd, errmsg => 'umount error'); 
+	run_command($cmd, errmsg => 'umount error');
     }
 }
 
 sub activate_volume {
-    my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
+    my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
 
     # do nothing by default
 }
 
 sub deactivate_volume {
-    my ($class, $storeid, $scfg, $volname, $cache) = @_;
+    my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
 
     # do nothing by default
 }
 
 sub check_connection {
-    my ($class, $storeid, $scfg) = @_;
-
-    my $server = $scfg->{server} ? $scfg->{server} : 'localhost';
-    my $volume = $scfg->{volume};
-
-    my $status = 0;
-
-    if($server && $server ne 'localhost' && $server ne '127.0.0.1'){
-	my $p = Net::Ping->new("tcp", 2);
-	$status = $p->ping($server);
-
-    }else{
-
-	my $parser = sub {
-	    my $line = shift;
-
-	    if ($line =~ m/Status: Started$/) {
-		$status = 1;
-	    }
-	};
-
-	my $cmd = ['/usr/sbin/gluster', 'volume', 'info', $volume];
+    my ($class, $storeid, $scfg, $cache) = @_;
 
-	run_command($cmd, errmsg => "glusterfs error", errfunc => sub {}, outfunc => $parser);
-    }
+    my $server = &$get_active_server($scfg);
 
-    return $status;
+    return defined($server) ? 1 : 0;
 }
 
 1;