Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2024-12-25 23:21:43 +03:00
Code Releases Activity

add size hint to drive options

Browse Source 
We now store the size when we create a drive. This is just a hint, but
good enough to display on the GUI. We can now avoid to query the storage in
vmstatus().
This commit is contained in:
Dietmar Maurer 2012-08-01 13:22:43 +02:00
parent 93ae06e180
commit 24afaca0b6
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/API2/Qemu.pm
View File

@ -81,6 +81,7 @@ my $create_disks = sub {
my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid,
$fmt, undef, $size*1024*1024);
$disk->{file} = $volid;
$disk->{size} = $size*1024*1024*1024;
push @$vollist, $volid;
delete $disk->{format}; # no longer needed
$res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
@ -106,7 +107,10 @@ my $create_disks = sub {
}
die "image '$path' does not exists\n" if (!(-f $path || -b $path || $foundvolid));
$res->{$ds} = $settings->{$ds};
my ($size) = PVE::Storage::volume_size_info($storecfg, $volid, 1);
$disk->{size} = $size;
$res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
}
});

77
PVE/QemuServer.pm
View File

@ -798,7 +798,7 @@ sub parse_drive {
foreach my $p (split (/,/, $data)) {
next if $p =~ m/^\s*$/;
if ($p =~ m/^(file|volume|cyls|heads|secs|trans|media|snapshot|cache|format|rerror|werror|backup|aio|bps|bps_rd|bps_wr|iops|iops_rd|iops_wr)=(.+)$/) {
if ($p =~ m/^(file|volume|cyls|heads|secs|trans|media|snapshot|cache|format|rerror|werror|backup|aio|bps|bps_rd|bps_wr|iops|iops_rd|iops_wr|size)=(.+)$/) {
my ($k, $v) = ($1, $2);
$k = 'file' if $k eq 'volume';
@ -844,6 +844,21 @@ sub parse_drive {
return undef if $res->{iops_wr} && $res->{iops_wr} !~ m/^\d+$/;
if ($res->{size}) {
return undef if $res->{size} !~ m/^([1-9]\d*(\.\d+)?)([KMG])?$/;
my ($size, $unit) = ($1, $3);
if ($unit) {
if ($unit eq 'K') {
$size = $size * 1024;
} elsif ($unit eq 'M') {
$size = $size * 1024 * 1024;
} elsif ($unit eq 'G') {
$size = $size * 1024 * 1024 * 1024;
}
}
$res->{size} = int($size);
}
if ($res->{media} && ($res->{media} eq 'cdrom')) {
return undef if $res->{snapshot} || $res->{trans} || $res->{format};
return undef if $res->{heads} || $res->{secs} || $res->{cyls};
@ -860,6 +875,23 @@ sub parse_drive {
my @qemu_drive_options = qw(heads secs cyls trans media format cache snapshot rerror werror aio bps bps_rd bps_wr iops iops_rd iops_wr);
my $format_size = sub {
my ($size) = @_;
$size = int($size);
my $kb = int($size/1024);
return $size if $kb*1024 != $size;
my $mb = int($kb/1024);
return "${kb}K" if $mb*1024 != $kb;
my $gb = int($mb/1024);
return "${mb}M" if $gb*1024 != $mb;
return "${gb}G";
};
sub print_drive {
my ($vmid, $drive) = @_;
@ -868,6 +900,10 @@ sub print_drive {
$opts .= ",$o=$drive->{$o}" if $drive->{$o};
}
if ($drive->{size}) {
$opts .= ",size=" . &$format_size($drive->{size});
}
return "$drive->{file}$opts";
}
@ -1771,8 +1807,6 @@ sub vzlist {
return $vzlist;
}
my $storage_timeout_hash = {};
sub disksize {
my ($storecfg, $conf) = @_;
@ -1790,42 +1824,7 @@ sub disksize {
my $volid = $drive->{file};
return undef if !$volid;
my $path;
my $storeid;
my $timeoutid;
if ($volid =~ m|^/|) {
$path = $timeoutid = $volid;
} else {
eval {
$storeid = $timeoutid = PVE::Storage::parse_volume_id($volid);
};
if (my $err = $@) {
warn $err;
return undef;
}
}
my $last_timeout = $storage_timeout_hash->{$timeoutid};
if ($last_timeout) {
if ((time() - $last_timeout) < 30) {
# skip storage with errors
return undef ;
}
delete $storage_timeout_hash->{$timeoutid};
}
my ($size, $format, $used);
($size, $format, $used) = PVE::Storage::volume_size_info($storecfg, $volid, 1);
if (!defined($format)) {
# got timeout
$storage_timeout_hash->{$timeoutid} = time();
return undef;
}
return wantarray ? ($size, $used) : $size;
return $drive->{size};
}
my $last_proc_pid_stat;