Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2025-02-10 21:57:22 +03:00
Code Releases Activity

rest env: cleanup active_worker code style

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-05-20 09:46:45 +02:00
parent efb57c6b08
commit f74da40ebb
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/PVE/RESTEnvironment.pm
View File

@ -258,20 +258,17 @@ sub is_worker {
return $WORKER_FLAG;
}
# read/update list of active workers
# we move all finished tasks to the archive index,
# but keep aktive and most recent task in the active file.
# $nocheck ... consider $new_upid still running (avoid that
# we try to read the reult to early.
sub active_workers {
# read/update list of active workers.
#
# we move all finished tasks to the archive index, but keep active, and most recent tasks in the
# active file.
# $nocheck ... consider $new_upid still running (avoid that we try to read the result to early).
sub active_workers {
my ($self, $new_upid, $nocheck) = @_;
my $lkfn = "/var/log/pve/tasks/.active.lock";
my $timeout = 10;
my $code = sub {
my $res = PVE::Tools::lock_file("/var/log/pve/tasks/.active.lock", $timeout, sub {
my $tasklist = PVE::INotify::read_file('active');
my @ta;
@ -297,8 +294,8 @@ sub active_workers {
&$check_task($task);
}
if ($new_upid && !(my $task = $thash->{$new_upid})) {
$task = PVE::Tools::upid_decode($new_upid);
if ($new_upid && !$thash->{$new_upid}) {
my $task = PVE::Tools::upid_decode($new_upid);
$task->{upid} = $new_upid;
$thash->{$new_upid} = $task;
&$check_task($task, $nocheck);
@ -351,10 +348,9 @@ sub active_workers {
}
}
# we try to reduce the amount of data
# list all running tasks and task and a few others
# try to limit to 25 tasks
my $max = 25 - scalar(@$tlist);
# we try to reduce the amount of data list all running tasks and task and a few others
my $MAX_FINISHED = 25;
my $max = $MAX_FINISHED - scalar(@$tlist);
foreach my $task (@ta) {
last if $max <= 0;
push @$tlist, $task;
@ -364,9 +360,7 @@ sub active_workers {
PVE::INotify::write_file('active', $tlist) if $save;
return $tlist;
};
my $res = PVE::Tools::lock_file($lkfn, $timeout, $code);
});
die $@ if $@;
return $res;