yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base plugin: return ctime for vm images

Browse Source 
Changed file_size_info() to additionally return ctime to avoid
another stat() call.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer
2020-03-04 11:46:21 +01:00
committed by Thomas Lamprecht
parent ff9c5451a5
commit 51eee96d31
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/Storage/Plugin.pm
View File

@ -718,8 +718,12 @@ sub free_image {
sub file_size_info { sub file_size_info {
my ($filename, $timeout) = @_; my ($filename, $timeout) = @_;
if (-d $filename) { my @fs = stat($filename);
return wantarray ? (0, 'subvol', 0, undef) : 1; my $mode = $fs[2];
my $ctime = $fs[10];
if (S_ISDIR($mode)) {
return wantarray ? (0, 'subvol', 0, undef, $ctime) : 1;
} }
my $json = ''; my $json = '';
@ -737,7 +741,7 @@ sub file_size_info {
my ($size, $format, $used, $parent) = $info->@{qw(virtual-size format actual-size backing-filename)}; my ($size, $format, $used, $parent) = $info->@{qw(virtual-size format actual-size backing-filename)};
return wantarray ? ($size, $format, $used, $parent) : $size; return wantarray ? ($size, $format, $used, $parent, $ctime) : $size;
} }
sub volume_size_info { sub volume_size_info {
@ -872,7 +876,7 @@ sub list_images {
next if !$vollist && defined($vmid) && ($owner ne $vmid); next if !$vollist && defined($vmid) && ($owner ne $vmid);
my ($size, $format, $used, $parent) = file_size_info($fn); my ($size, $format, $used, $parent, $ctime) = file_size_info($fn);
next if !($format && defined($size)); next if !($format && defined($size));
my $volid; my $volid;
@ -888,10 +892,14 @@ sub list_images {
next if !$found; next if !$found;
} }
push @$res, { my $info = {
volid => $volid, format => $format, volid => $volid, format => $format,
size => $size, vmid => $owner, used => $used, parent => $parent size => $size, vmid => $owner, used => $used, parent => $parent
}; };
$info->{ctime} = $ctime if $ctime;
push @$res, $info;
} }
return $res; return $res;