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

job_status: simplify fixup of jobs for stolen guests

Browse Source 
by using switch_replication_job_target_nolock.

If a job is scheduled for removal and the guest was
stolen, it still makes sense to correct the job entry,
which didn't happen previously.

AFAICT, this was the only user of swap_source_target_nolock.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-10-29 14:31:29 +01:00 committed by Fabian Grünbichler
parent 0c3550c014
commit f6c5ba3cdb
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/ReplicationConfig.pm
View File

@ -279,19 +279,6 @@ sub remove_vmid_jobs {
lock($code);
}
sub swap_source_target_nolock {
my ($jobid) = @_;
my $cfg = __PACKAGE__->new();
my $job = $cfg->{ids}->{$jobid};
my $tmp = $job->{source};
$job->{source} = $job->{target};
$job->{target} = $tmp;
$cfg->write();
return $cfg->{ids}->{$jobid};
}
package PVE::ReplicationConfig::Cluster;
use base qw(PVE::ReplicationConfig);

34
PVE/ReplicationState.pm
View File

@ -251,23 +251,22 @@ sub job_status {
# only consider guest on local node
next if $vms->{ids}->{$vmid}->{node} ne $local_node;
my $target = $jobcfg->{target};
if (!$jobcfg->{remove_job}) {
# check if vm was stolen (swapped source target)
if ($target eq $local_node) {
my $source = $jobcfg->{source};
if (defined($source) && $source ne $target) {
$jobcfg = PVE::ReplicationConfig::swap_source_target_nolock($jobid);
$cfg->{ids}->{$jobid} = $jobcfg;
} else {
# never sync to local node
next;
}
}
next if !$get_disabled && $jobcfg->{disable};
# source is optional in schema, but we set it automatically
if (!defined($jobcfg->{source})) {
$jobcfg->{source} = $local_node;
$cfg->write();
}
# fix jobs for stolen guest
$cfg->switch_replication_job_target_nolock($vmid, $local_node, $jobcfg->{source})
if $local_node ne $jobcfg->{source};
my $target = $jobcfg->{target};
# never sync to local node
next if !$jobcfg->{remove_job} && $target eq $local_node;
next if !$get_disabled && $jobcfg->{disable};
my $state = extract_job_state($stateobj, $jobcfg);
$jobcfg->{state} = $state;
$jobcfg->{id} = $jobid;
@ -293,11 +292,6 @@ sub job_status {
$jobcfg->{next_sync} = $next_sync;
if (!defined($jobcfg->{source}) || $jobcfg->{source} ne $local_node) {
$jobcfg->{source} = $cfg->{ids}->{$jobid}->{source} = $local_node;
PVE::ReplicationConfig::write($cfg);
}
$jobs->{$jobid} = $jobcfg;
}
};