my $portal = $scfg->{portal};
my ($server, $port) = split(':', $portal);
- my $cmd = ['/usr/sbin/collie', $class, $op, '-a', $server];
+ my $cmd = ['/usr/sbin/dog', $class, $op, '-a', $server];
push @$cmd, '-p', $port if $port;
push @$cmd, @options if scalar(@options);
sub sheepdog_ls {
my ($scfg, $storeid) = @_;
- my $cmd = &$collie_cmd($scfg, 'vdi', 'list', '-r');
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'graph');
- my $list = {};
+ my $relationship = {};
+ my $child = undef;
run_command($cmd, outfunc => sub {
my $line = shift;
+
+ my $parent = undef;
+ my $name = undef;
+
$line = trim($line);
- if ($line =~ /= (vm-(\d+)-\S+)\s+(\d+)\s+(\d+)\s(\d+)\s(\d+)\s/) {
- my $image = $1;
- my $owner = $2;
- my $size = $4;
+ if ($line =~ /\"(\S+)\"\s->\s\"(\S+)\"/) {
+ $parent = $1;
+ $child = $2;
+ $relationship->{$child}->{parent} = $parent;
+ }
+ elsif ($line =~ /group\s\=\s\"(\S+)\",/) {
+ $name = $1;
+ $relationship->{$child}->{name} = $name if $child;
+
+ }
+
+ });
+
+
+ $cmd = &$collie_cmd($scfg, 'vdi', 'list', '-r');
+
+ my $list = {};
+
+ run_command($cmd, outfunc => sub {
+ my $line = shift;
+ $line = trim($line);
+ if ($line =~ /(=|c) ((vm|base)-(\d+)-\S+)\s+(\d+)\s+(\d+)\s(\d+)\s(\d+)\s(\d+)\s(\S+)\s(\d+)/) {
+ my $image = $2;
+ my $owner = $4;
+ my $size = $6;
+ my $idvdi = $10;
+ my $parentid = $relationship->{$idvdi}->{parent} if $relationship->{$idvdi}->{parent};
+ my $parent = $relationship->{$parentid}->{name} if $parentid;
$list->{$storeid}->{$image} = {
name => $image,
size => $size,
+ parent => $parent,
vmid => $owner
};
}
return $list;
}
+sub sheepdog_snapshot_ls {
+ my ($scfg, $volname) = @_;
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'list', '-r');
+
+ my $list = {};
+ run_command($cmd, outfunc => sub {
+ my $line = shift;
+ $line = trim($line);
+ if ($line =~ m/s $volname (\d+) (\d+) (\d+) (\d+) (\d+) (\S+) (\d+) (\S+)/) {
+ $list->{$8} = 1;
+ }
+ });
+
+ return $list;
+}
+
# Configuration
sub parse_volname {
my ($class, $volname) = @_;
- if ($volname =~ m/^(vm-(\d+)-\S+)$/) {
- return ('images', $1, $2);
+ if ($volname =~ m/^((base-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
+ return ('images', $4, $7, $2, $3, $5);
}
- die "unable to parse rbd volume name '$volname'\n";
+ die "unable to parse sheepdog volume name '$volname'\n";
}
sub path {
- my ($class, $scfg, $volname, $storeid) = @_;
+ my ($class, $scfg, $volname, $storeid, $snapname) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $portal = $scfg->{portal};
my ($server, $port) = split(':', $portal);
$port = 7000 if !$port;
+ $name .= ':'.$snapname if $snapname;
my $path = "sheepdog:$server:$port:$name";
return ($path, $vmid, $vtype);
}
-sub alloc_image {
- my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_;
+my $find_free_diskname = sub {
+ my ($storeid, $scfg, $vmid) = @_;
+ my $sheepdog = sheepdog_ls($scfg, $storeid);
+ my $dat = $sheepdog->{$storeid};
+ my $disk_ids = {};
- die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
- if $name && $name !~ m/^vm-$vmid-/;
-
- if (!$name) {
- my $sheepdog = sheepdog_ls($scfg, $storeid);
+ foreach my $image (keys %$dat) {
+ my $volname = $dat->{$image}->{name};
+ if ($volname =~ m/(vm|base)-$vmid-disk-(\d+)/){
+ $disk_ids->{$2} = 1;
+ }
+ }
- for (my $i = 1; $i < 100; $i++) {
- my $tn = "vm-$vmid-disk-$i";
- if (!defined ($sheepdog->{$storeid}->{$tn})) {
- $name = $tn;
- last;
- }
+ for (my $i = 1; $i < 100; $i++) {
+ if (!$disk_ids->{$i}) {
+ return "vm-$vmid-disk-$i";
}
}
- die "unable to allocate an image name for VM $vmid in storage '$storeid'\n"
- if !$name;
+ die "unable to allocate an image name for VM $vmid in storage '$storeid'\n";
+};
+
+sub create_base {
+ my ($class, $storeid, $scfg, $volname) = @_;
+
+ my $snap = '__base__';
+
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ $class->parse_volname($volname);
+
+ die "create_base not possible with base image\n" if $isBase;
+
+ my $sheepdog = sheepdog_ls($scfg, $storeid);
+ die "sheepdog volume info on '$name' failed\n" if !($sheepdog->{$storeid}->{$name});
+ my $parent = $sheepdog->{$storeid}->{$name}->{parent};
+
+ die "volname '$volname' contains wrong information about parent $parent $basename\n"
+ if $basename && (!$parent || $parent ne $basename);
+
+ my $newname = $name;
+ $newname =~ s/^vm-/base-/;
+
+ my $newvolname = $basename ? "$basename/$newname" : "$newname";
+
+ #sheepdog can't rename, so we clone then delete the parent
+
+ my $tempsnap = '__tempforbase__';
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'snapshot', '-s', $tempsnap, $name);
+ run_command($cmd, errmsg => "sheepdog snapshot $volname' error");
+
+ $cmd = &$collie_cmd($scfg, 'vdi', 'clone', '-s', $tempsnap, $name, $newname);
+ run_command($cmd, errmsg => "sheepdog clone $volname' error");
+
+ $cmd = &$collie_cmd($scfg, 'vdi', 'delete', '-s', $tempsnap, $name);
+ run_command($cmd, errmsg => "sheepdog delete snapshot $volname' error");
+
+ $cmd = &$collie_cmd($scfg, 'vdi', 'delete' , $name);
+ run_command($cmd, errmsg => "sheepdog delete $volname' error");
- my $cmd = &$collie_cmd($scfg, 'vdi', 'create', $name , "${size}KB");
+ #create the base snapshot
+ my $running = undef; #fixme : is create_base always offline ?
+
+ $class->volume_snapshot($scfg, $storeid, $newname, $snap, $running);
+
+ return $newvolname;
+}
+
+sub clone_image {
+ my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_;
+
+ $snap ||= '__base__';
+
+ my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
+ $class->parse_volname($volname);
+
+ die "clone_image only works on base images\n" if !$isBase;
+
+ my $name = &$find_free_diskname($storeid, $scfg, $vmid);
+
+ warn "clone $volname: $basename to $name\n";
+
+ my $newvol = "$basename/$name";
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'clone', '-s', $snap, $basename, $name);
+ run_command($cmd, errmsg => "sheepdog clone $volname' error");
+
+ return $newvol;
+}
+
+sub alloc_image {
+ my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_;
+
+ die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
+ if $name && $name !~ m/^vm-$vmid-/;
+
+ $name = &$find_free_diskname($storeid, $scfg, $vmid) if !$name;
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'create', $name , "${size}k");
run_command($cmd, errmsg => "sheepdog create $name' error");
}
sub free_image {
- my ($class, $storeid, $scfg, $volname) = @_;
+ my ($class, $storeid, $scfg, $volname, $isBase) = @_;
- my $cmd = &$collie_cmd($scfg, 'vdi', 'delete' , $volname);
+ my ($vtype, $name, $vmid, undef, undef, undef) =
+ $class->parse_volname($volname);
- run_command($cmd, errmsg => "sheepdog delete $volname' error");
+ my $snapshots = sheepdog_snapshot_ls($scfg, $name);
+ while (my ($snapname) = each %$snapshots) {
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'delete' , '-s', $snapname, $name);
+ run_command($cmd, errmsg => "sheepdog delete snapshot $snapname $name' error");
+ }
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'delete' , $name);
+
+ run_command($cmd, errmsg => "sheepdog delete $name' error");
return undef;
}
foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name};
+ my $parent = $dat->{$image}->{parent};
- my $volid = "$storeid:$volname";
+ my $volid = undef;
+ if ($parent && $parent ne $volname) {
+ $volid = "$storeid:$parent/$volname";
+ } else {
+ $volid = "$storeid:$volname";
+ }
my $owner = $dat->{$volname}->{vmid};
if ($vollist) {
sub volume_size_info {
my ($class, $scfg, $storeid, $volname, $timeout) = @_;
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ $class->parse_volname($volname);
+
my $size = undef;
- my $cmd = &$collie_cmd($scfg, 'vdi', 'list', '-r', $volname);
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'list', '-r');
run_command($cmd, outfunc => sub {
my $line = shift;
$line = trim($line);
- if ($line =~ /= (vm-(\d+)-\S+)\s+(\d+)\s+(\d+)\s(\d+)\s(\d+)\s/) {
- $size = $4;
+ if ($line =~ /(=|c) $name\s+(\d+)\s+(\d+)\s(\d+)\s(\d+)\s/) {
+ $size = $3;
}
});
sub volume_resize {
my ($class, $scfg, $storeid, $volname, $size, $running) = @_;
- my $cmd = &$collie_cmd($scfg, 'vdi', 'resize' , $volname, $size);
- run_command($cmd, errmsg => "sheepdog resize $volname' error");
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ $class->parse_volname($volname);
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'resize' , $name, $size);
+ run_command($cmd, errmsg => "sheepdog resize $name' error");
return undef;
}
sub volume_snapshot {
+ my ($class, $scfg, $storeid, $volname, $snap) = @_;
+
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ $class->parse_volname($volname);
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'snapshot', '-s', $snap, $name);
+ run_command($cmd, errmsg => "sheepdog snapshot $volname' error");
+
+ return undef;
+}
+
+sub volume_snapshot_rollback {
+ my ($class, $scfg, $storeid, $volname, $snap) = @_;
+
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ $class->parse_volname($volname);
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'rollback', '-f', '-s', $snap, $name);
+ run_command($cmd, errmsg => "sheepdog snapshot $name' error");
+
+}
+
+sub volume_snapshot_delete {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
return 1 if $running;
- my $cmd = &$collie_cmd($scfg, 'vdi', 'snapshot', '-s', $snap, $volname);
- run_command($cmd, errmsg => "sheepdog snapshot $volname' error");
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ $class->parse_volname($volname);
+
+ my $cmd = &$collie_cmd($scfg, 'vdi', 'delete', '-s', $snap, $name);
+ run_command($cmd, errmsg => "sheepdog snapshot $name' error");
+
+ return undef;
+}
+
+sub volume_has_feature {
+ my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_;
+
+ my $features = {
+ snapshot => { current => 1, snap => 1},
+ clone => { base => 1},
+ template => { current => 1},
+ copy => { base => 1, current => 1, snap => 1},
+ };
+
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ $class->parse_volname($volname);
+
+ my $key = undef;
+ if($snapname){
+ $key = 'snap';
+ }else{
+ $key = $isBase ? 'base' : 'current';
+ }
+ return 1 if $features->{$feature}->{$key};
return undef;
}
projects / pve-storage.git / blobdiff