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

Fix #582: Add DELETE delay logic

Browse Source 
Previously, the web GUI timed out when removing content (e.g. backup) took
too long. Doing the main part of the API DELETE call in a fork_worker solves
this.

Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
This commit is contained in:
Dominic Jäger
2019-07-15 12:28:20 +02:00
committed by Thomas Lamprecht
parent a14e0a5e95
commit 1f56f6f8d1
1 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
PVE/API2/Storage/Content.pm
View File

@ -285,9 +285,16 @@ __PACKAGE__->register_method ({
type => 'string', type => 'string',
completion => \&PVE::Storage::complete_volume, completion => \&PVE::Storage::complete_volume,
}, },
delay => {
type => 'integer',
description => "Time to wait for the task to finish. We return 'null' if the task finish within that time.",
minimum => 1,
maximum => 30,
optional => 1,
},
}, },
}, },
returns => { type => 'null' }, returns => { type => 'string', optional => 1, },
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
@ -306,16 +313,36 @@ __PACKAGE__->register_method ({
$rpcenv->check($authuser, "/storage/$storeid", ['Datastore.Allocate']); $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.Allocate']);
} }
PVE::Storage::vdisk_free ($cfg, $volid); my $worker = sub {
PVE::Storage::vdisk_free ($cfg, $volid);
print "Removed volume '$volid'\n";
if ($vtype eq 'backup'
&& $path =~ /(.*\/vzdump-\w+-\d+-\d{4}_\d{2}_\d{2}-\d{2}_\d{2}_\d{2})[^\/]+$/) {
my $logpath = "$1.log";
# try to cleanup our backup log file too, if still exisiting, #318
unlink($logpath) if -e $logpath;
}
};
if ($vtype eq 'backup' my $id = (defined $ownervm ? "$ownervm@" : '') . $storeid;
&& $path =~ /(.*\/vzdump-\w+-\d+-\d{4}_\d{2}_\d{2}-\d{2}_\d{2}_\d{2})[^\/]+$/) { my $upid = $rpcenv->fork_worker('imgdel', $id, $authuser, $worker);
my $logpath = "$1.log"; my $background_delay = $param->{delay};
# try to cleanup our backup log file too, if still exisiting, #318 if ($background_delay) {
unlink($logpath) if -e $logpath; my $end_time = time() + $background_delay;
my $currently_deleting; # not necessarily true, e.g. sequential api call from cli
do {
my $task = PVE::Tools::upid_decode($upid);
$currently_deleting = PVE::ProcFSTools::check_process_running($task->{pid}, $task->{pstart});
sleep 1 if $currently_deleting;
} while (time() < $end_time && $currently_deleting);
if (!$currently_deleting) {
my $status = PVE::Tools::upid_read_status($upid);
return undef if $status eq 'OK';
die $status;
}
} }
return $upid;
return undef;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({