Upstream proxmox-git/pve-manager state of the touched files before ac0c87dd37
This commit is contained in:
1 parent
8a2a44a473
commit
0085410b6c
1 file changed
+1
-3
+1
-3
@@ -109,15 +109,13 @@ my $get_job_task_status = sub {
|
|||||||
|
|
||||||
my ($task, $filename) = PVE::Tools::upid_decode($state->{upid}, 1);
|
my ($task, $filename) = PVE::Tools::upid_decode($state->{upid}, 1);
|
||||||
die "unable to parse worker upid - $state->{upid}\n" if !$task;
|
die "unable to parse worker upid - $state->{upid}\n" if !$task;
|
||||||
|
die "no such task\n" if !-f $filename;
|
||||||
|
|
||||||
my $pstart = PVE::ProcFSTools::read_proc_starttime($task->{pid});
|
my $pstart = PVE::ProcFSTools::read_proc_starttime($task->{pid});
|
||||||
if ($pstart && $pstart == $task->{pstart}) {
|
if ($pstart && $pstart == $task->{pstart}) {
|
||||||
return; # still running
|
return; # still running
|
||||||
}
|
}
|
||||||
|
|
||||||
# the task log might be gone, e.g. after a crash, do not let that block the job forever
|
|
||||||
return "task log not found" if !-f $filename;
|
|
||||||
|
|
||||||
return PVE::Tools::upid_read_status($state->{upid});
|
return PVE::Tools::upid_read_status($state->{upid});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user