return $cmd;
};
+sub run_rbd_command {
+ my ($cmd, %args) = @_;
+
+ my $lasterr;
+ my $errmsg = $args{errmsg} . ": " || "";
+ if (!exists($args{errfunc})) {
+ # ' error: 2014-02-06 11:51:59.839135 7f09f94d0760 -1 librbd: snap_unprotect: can't unprotect;
+ # at least 1 child(ren) in pool cephstor1
+ $args{errfunc} = sub {
+ my $line = shift;
+ if ($line =~ m/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]+ [\-\d]+ librbd: (.*)$/) {
+ $lasterr = "$1\n";
+ } else {
+ $lasterr = $line;
+ }
+ print STDERR $lasterr;
+ *STDERR->flush();
+ };
+ }
+
+ eval { run_command($cmd, %args); };
+ if (my $err = $@) {
+ die $errmsg . $lasterr if length($lasterr);
+ die $err;
+ }
+
+ return undef;
+}
+
sub rbd_ls {
my ($scfg, $storeid) = @_;
};
eval {
- run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+ run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
};
my $err = $@;
};
- run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+ run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
return ($size, $parent, $format, $protected);
}
-sub addslashes {
- my $text = shift;
- $text =~ s/;/\\;/g;
- $text =~ s/:/\\:/g;
- return $text;
-}
-
# Configuration
PVE::JSONSchema::register_format('pve-storage-monhost', \&parse_monhost);
sub plugindata {
return {
- content => [ {images => 1}, { images => 1 }],
+ content => [ {images => 1, rootdir => 1}, { images => 1 }],
};
}
description => "Authsupported.",
type => 'string',
},
+ krbd => {
+ description => "Access rbd through krbd kernel module.",
+ type => 'boolean',
+ },
};
}
pool => { optional => 1 },
username => { optional => 1 },
content => { optional => 1 },
+ krbd => { optional => 1 },
};
}
my ($class, $volname) = @_;
if ($volname =~ m/^((base-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
- return ('images', $4, $7, $2, $3, $5);
+ return ('images', $4, $7, $2, $3, $5, 'raw');
}
die "unable to parse rbd volume name '$volname'\n";
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
$name .= '@'.$snapname if $snapname;
- my $monhost = addslashes($scfg->{monhost});
+ my $monhost = $scfg->{monhost};
+ $monhost =~ s/:/\\:/g;
+
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $username = $scfg->{username} ? $scfg->{username} : 'admin';
$path .= ":auth_supported=none";
}
+ $path = "/dev/rbd/$pool/$name" if $scfg->{krbd};
+
return ($path, $vmid, $vtype);
}
my $newvolname = $basename ? "$basename/$newname" : "$newname";
my $cmd = &$rbd_cmd($scfg, $storeid, 'rename', &$add_pool_to_disk($scfg, $name), &$add_pool_to_disk($scfg, $newname));
- run_command($cmd, errmsg => "rbd rename $name' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd rename '$name' error");
my $running = undef; #fixme : is create_base always offline ?
if (!$protected){
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $newname, '--snap', $snap);
- run_command($cmd, errmsg => "rbd protect $newname snap $snap' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd protect $newname snap '$snap' error");
}
return $newvolname;
}
sub clone_image {
- my ($class, $scfg, $storeid, $volname, $vmid) = @_;
+ my ($class, $scfg, $storeid, $volname, $vmid, $snapname) = @_;
my $snap = '__base__';
+ $snap = $snapname if length $snapname;
my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
$class->parse_volname($volname);
- die "clone_image onyl works on base images\n" if !$isBase;
+ die "$volname is not a base image and snapname is not provided\n"
+ if !$isBase && !length($snapname);
my $name = &$find_free_diskname($storeid, $scfg, $vmid);
- warn "clone $volname: $basename to $name\n";
+ warn "clone $volname: $basename snapname $snap to $name\n";
+
+ if (length($snapname)) {
+ my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $volname, $snapname);
+
+ if (!$protected) {
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $volname, '--snap', $snapname);
+ run_rbd_command($cmd, errmsg => "rbd protect $volname snap $snapname error");
+ }
+ }
my $newvol = "$basename/$name";
+ $newvol = $name if length($snapname);
- my $cmd = &$rbd_cmd($scfg, $storeid, 'clone', &$add_pool_to_disk($scfg, $basename), '--snap', $snap, &$add_pool_to_disk($scfg, $name));
- run_command($cmd, errmsg => "rbd clone $basename' error", errfunc => sub {});
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'clone', &$add_pool_to_disk($scfg, $basename),
+ '--snap', $snap, &$add_pool_to_disk($scfg, $name));
+
+ run_rbd_command($cmd, errmsg => "rbd clone '$basename' error");
return $newvol;
}
die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
if $name && $name !~ m/^vm-$vmid-/;
- $name = &$find_free_diskname($storeid, $scfg, $vmid);
+ $name = &$find_free_diskname($storeid, $scfg, $vmid) if !$name;
- my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--format' , 2, '--size', int(($size+1023)/1024), $name);
- run_command($cmd, errmsg => "rbd create $name' error", errfunc => sub {});
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--image-format' , 2, '--size', int(($size+1023)/1024), $name);
+ run_rbd_command($cmd, errmsg => "rbd create $name' error");
return $name;
}
my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $name, $snap);
if ($protected){
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
- run_command($cmd, errmsg => "rbd unprotect $name snap $snap' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd unprotect $name snap '$snap' error");
}
}
+ $class->deactivate_volume($storeid, $scfg, $volname);
+
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'purge', $name);
- run_command($cmd, errmsg => "rbd snap purge $volname' error", outfunc => sub {}, errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd snap purge '$volname' error");
$cmd = &$rbd_cmd($scfg, $storeid, 'rm', $name);
- run_command($cmd, errmsg => "rbd rm $volname' error", outfunc => sub {}, errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd rm '$volname' error");
return undef;
}
};
eval {
- run_command($cmd, errmsg => "rados error", errfunc => sub {}, outfunc => $parser);
+ run_rbd_command($cmd, errmsg => "rados error", errfunc => sub {}, outfunc => $parser);
};
my $total = $stats->{space} ? $stats->{space}*1024 : 0;
}
sub activate_volume {
- my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
+ my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
+
+ return 1 if !$scfg->{krbd};
+
+ my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+
+ my $path = "/dev/rbd/$pool/$name";
+ $path .= '@'.$snapname if $snapname;
+ return if -b $path;
+
+ $name .= '@'.$snapname if $snapname;
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'map', $name);
+ run_rbd_command($cmd, errmsg => "can't mount rbd volume $name");
+
return 1;
}
sub deactivate_volume {
- my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
+ my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
+
+ return 1 if !$scfg->{krbd};
+
+ my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+
+ my $path = "/dev/rbd/$pool/$name";
+ $path .= '@'.$snapname if $snapname;
+ return if ! -b $path;
+
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'unmap', $path);
+ run_rbd_command($cmd, errmsg => "can't unmount rbd volume $name");
+
return 1;
}
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $cmd = &$rbd_cmd($scfg, $storeid, 'resize', '--size', ($size/1024/1024), $name);
- run_command($cmd, errmsg => "rbd resize $volname' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd resize '$volname' error");
return undef;
}
sub volume_snapshot {
- my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
-
- return 1 if $running;
+ my ($class, $scfg, $storeid, $volname, $snap) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'create', '--snap', $snap, $name);
- run_command($cmd, errmsg => "rbd snapshot $volname' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
return undef;
}
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rollback', '--snap', $snap, $name);
- run_command($cmd, errmsg => "rbd snapshot $volname to $snap' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd snapshot $volname to '$snap' error");
}
sub volume_snapshot_delete {
return 1 if $running;
+ $class->deactivate_volume($storeid, $scfg, $volname, $snap, {});
+
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+ my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $name, $snap);
+ if ($protected){
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
+ run_rbd_command($cmd, errmsg => "rbd unprotect $name snap '$snap' error");
+ }
+
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rm', '--snap', $snap, $name);
- run_command($cmd, errmsg => "rbd snapshot $volname' error", errfunc => sub {});
+
+ run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
+
return undef;
}
my $features = {
snapshot => { current => 1, snap => 1},
- clone => { base => 1},
+ clone => { base => 1, snap => 1},
template => { current => 1},
copy => { base => 1, current => 1, snap => 1},
};