Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-02-28 01:58:06 +03:00
Code Releases Activity

allow rbd images < 1M to be detected

Browse Source 
without this, having an efidisk on a ceph storage
prevents creating another disk on the same
ceph storage, because it will not be detected
and we try to allocate one with the same name

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2016-10-06 11:42:28 +02:00 committed by Dietmar Maurer
parent 865d39a0a5
commit a0028cf97e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/Storage/RBDPlugin.pm
View File

@ -11,6 +11,7 @@ use PVE::JSONSchema qw(get_standard_option);
use base qw(PVE::Storage::Plugin);
my $rbd_unittobytes = {
"k" => 1024,
"M" => 1024*1024,
"G" => 1024*1024*1024,
"T" => 1024*1024*1024*1024,
@ -183,7 +184,7 @@ sub rbd_ls {
my $parser = sub {
my $line = shift;
if ($line =~ m/^((vm|base)-(\d+)-disk-\d+)\s+(\d+)(M|G|T)\s((\S+)\/((vm|base)-\d+-\S+@\S+))?/) {
if ($line =~ m/^((vm|base)-(\d+)-disk-\d+)\s+(\d+)(k|M|G|T)\s((\S+)\/((vm|base)-\d+-\S+@\S+))?/) {
my ($image, $owner, $size, $unit, $parent) = ($1, $3, $4, $5, $8);
$list->{$pool}->{$image} = {
@ -224,7 +225,7 @@ sub rbd_volume_info {
my $parser = sub {
my $line = shift;
if ($line =~ m/size (\d+) (M|G|T)B in (\d+) objects/) {
if ($line =~ m/size (\d+) (k|M|G|T)B in (\d+) objects/) {
$size = $1 * $rbd_unittobytes->{$2} if ($1);
} elsif ($line =~ m/parent:\s(\S+)\/(\S+)/) {
$parent = $2;