my $status = 0;
if ($server && $server ne 'localhost' && $server ne '127.0.0.1' && $server ne '::1') {
-
- # ping the echo port (7) without service check
- $status = PVE::Network::tcp_ping($server, undef, 2);
+ # ping the gluster daemon default port (24007) as heuristic
+ $status = PVE::Network::tcp_ping($server, 24007, 2);
} else {
sub plugindata {
return {
- content => [ { images => 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' ],
};
server2 => { optional => 1 },
volume => { fixed => 1 },
transport => { optional => 1 },
- nodes => { optional => 1 },
+ nodes => { optional => 1 },
disable => { optional => 1 },
- maxfiles => { optional => 1 },
+ maxfiles => { optional => 1 },
+ 'prune-backups' => { optional => 1 },
+ 'max-protected-backups' => { optional => 1 },
content => { optional => 1 },
format => { optional => 1 },
mkdir => { optional => 1 },
bwlimit => { optional => 1 },
+ preallocation => { optional => 1 },
};
}
die "unable to parse volume filename '$name'\n";
}
-my $find_free_diskname = sub {
- my ($imgdir, $vmid, $fmt, $scfg) = @_;
-
- my $disk_list = [];
-
- my $dh = IO::Dir->new ($imgdir);
- @$disk_list = $dh->read() if defined($dh);
-
- return PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $imgdir, $vmid, $fmt, $scfg, 1);
-};
-
sub path {
my ($class, $scfg, $volname, $storeid, $snapname) = @_;
sub clone_image {
my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_;
- die "storage definintion has no path\n" if !$scfg->{path};
+ die "storage definition has no path\n" if !$scfg->{path};
my ($vtype, $basename, $basevmid, undef, undef, $isBase, $format) =
$class->parse_volname($volname);
mkpath $imagedir;
- my $name = $find_free_diskname->($imagedir, $vmid, "qcow2", $scfg);
+ my $name = $class->find_free_diskname($storeid, $scfg, $vmid, "qcow2", 1);
warn "clone $volname: $vtype, $name, $vmid to $name (base=../$basevmid/$basename)\n";
my $volumepath = "gluster://$server/$glustervolume/images/$vmid/$name";
my $cmd = ['/usr/bin/qemu-img', 'create', '-b', "../$basevmid/$basename",
- '-f', 'qcow2', $volumepath];
+ '-F', $format, '-f', 'qcow2', $volumepath];
run_command($cmd, errmsg => "unable to create image");
mkpath $imagedir;
- $name = $find_free_diskname->($imagedir, $vmid, $fmt, $scfg) if !$name;
+ $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 1) if !$name;
my (undef, $tmpfmt) = parse_name_dir($name);
my $cmd = ['/usr/bin/qemu-img', 'create'];
- push @$cmd, '-o', 'preallocation=metadata' if $fmt eq 'qcow2';
+ my $prealloc_opt = PVE::Storage::Plugin::preallocation_cmd_option($scfg, $fmt);
+ push @$cmd, '-o', $prealloc_opt if defined($prealloc_opt);
push @$cmd, '-f', $fmt, $volumepath, "${size}K";
- run_command($cmd, errmsg => "unable to create image");
+ eval { run_command($cmd, errmsg => "unable to create image"); };
+ if ($@) {
+ unlink $path;
+ rmdir $imagedir;
+ die "$@";
+ }
return "$vmid/$name";
}