Proxmox/pve-guest-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-guest-common.git synced 2025-01-10 01:17:51 +03:00
Code Releases Activity

vzdump: re-factor remove_vmid_from_jobs to checking a single job

Browse Source 
that way we'll be able to re-use it for adding support of cleaning
out vzdump jobs from the newish job.cfg

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-11-12 14:18:06 +01:00
parent b41392062f
commit 915e7a0216
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/PVE/VZDump/Plugin.pm
View File

@ -176,30 +176,24 @@ sub remove_vmid_from_list {
return join(',', grep { $_ ne $rm_vmid } PVE::Tools::split_list($list));
}
sub remove_vmid_from_jobs {
my ($jobs, $exclude_vmid) = @_;
sub remove_vmid_from_job {
my ($job, $exclude_vmid) = @_;
my $updated_jobs = [];
foreach my $job (@$jobs) {
if (defined $job->{vmid}) {
my $list = remove_vmid_from_list($job->{vmid}, $exclude_vmid);
if ($list) {
$job->{vmid} = $list;
push @$updated_jobs, $job;
}
} elsif (defined $job->{exclude}) {
my $list = remove_vmid_from_list($job->{exclude}, $exclude_vmid);
if ($list) {
$job->{exclude} = $list;
} else {
delete $job->{exclude};
}
push @$updated_jobs, $job;
if (defined $job->{vmid}) {
if (my $list = remove_vmid_from_list($job->{vmid}, $exclude_vmid)) {
$job->{vmid} = $list;
} else {
push @$updated_jobs, $job;
return undef;
}
} elsif (defined $job->{exclude}) {
my $list = remove_vmid_from_list($job->{exclude}, $exclude_vmid);
if ($list) {
$job->{exclude} = $list;
} else {
delete $job->{exclude};
}
}
return $updated_jobs;
return $job;
}
sub remove_vmid_from_backup_jobs {
@ -208,10 +202,17 @@ sub remove_vmid_from_backup_jobs {
cfs_lock_file('vzdump.cron', undef, sub {
my $vzdump_jobs = cfs_read_file('vzdump.cron');
my $jobs = $vzdump_jobs->{jobs} || [];
$vzdump_jobs->{jobs} = remove_vmid_from_jobs($jobs, $vmid);
my $updated_jobs = [];
foreach my $job ($jobs->@*) {
$job = remove_vmid_from_job($job, $vmid);
push @$updated_jobs, $job if $job;
}
$vzdump_jobs->{jobs} = $updated_jobs;
cfs_write_file('vzdump.cron', $vzdump_jobs);
});
die "$@" if ($@);
die "$@" if $@;
}
1;