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

replication - allow removal of jobs with target on local node

Browse Source
This commit is contained in:
Dietmar Maurer 2017-05-31 13:54:40 +02:00
parent b7a20a34bf
commit 495aa710f2
3 changed files with 79 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/Replication.pm
View File

@ -92,10 +92,12 @@ sub job_status {
# only consider guest on local node
next if $vms->{ids}->{$vmid}->{node} ne $local_node;
# never sync to local node
next if $jobcfg->{target} eq $local_node;
if (!$jobcfg->{remove_job}) {
# never sync to local node
next if $jobcfg->{target} eq $local_node;
next if $jobcfg->{disable};
next if $jobcfg->{disable};
}
my $state = $get_job_state->($stateobj, $jobcfg);
$jobcfg->{state} = $state;
@ -310,7 +312,7 @@ sub replicate {
$logfunc->($start_time, "$jobid: start job removal - mode '${remove_job}'");
if ($remove_job eq 'full') {
if ($remove_job eq 'full' && $jobcfg->{target} ne $local_node) {
# remove all remote volumes
remote_prepare_local_job($ssh_info, $jobid, $vmid, [], 0, 1);

8
bin/test/replication_test6.log Normal file
View File

@ -0,0 +1,8 @@
1000 job_900_to_node1: new job next_sync => 1
1000 job_900_to_node1: start replication job
1000 job_900_to_node1: guest => 900, type => qemu, running => 0
1000 job_900_to_node1: volumes => local-zfs:vm-900-disk-1
1000 job_900_to_node1: start job removal - mode 'full'
1000 job_900_to_node1: job removed
1000 job_900_to_node1: end replication job
1000 job_900_to_node1: vanished job

65
bin/test/replication_test6.pl Executable file
View File

@ -0,0 +1,65 @@
#!/usr/bin/perl
# Note: Try to delete replication job with target on same node
use strict;
use warnings;
use JSON;
use lib ('.', '../..');
use Data::Dumper;
use Test::MockModule;
use ReplicationTestEnv;
$ReplicationTestEnv::mocked_nodename = 'node1';
my $mocked_delete_job = sub {
my ($jobid) = @_;
delete $ReplicationTestEnv::mocked_replication_jobs->{$jobid};
};
my $pve_replication_module = Test::MockModule->new('PVE::Replication');
$pve_replication_module->mock(
delete_job => $mocked_delete_job);
my $testjob = {
'type' => 'local',
'target' => 'node1',
'guest' => 900,
};
$ReplicationTestEnv::mocked_replication_jobs = {
job_900_to_node1 => {
remove_job => 'full',
type => 'local',
target => 'node1', # local node, job should be skipped
guest => 900,
},
};
$ReplicationTestEnv::mocked_vm_configs = {
900 => {
node => 'node1',
snapshots => {},
ide0 => 'local-zfs:vm-900-disk-1,size=4G',
memory => 512,
ide2 => 'none,media=cdrom',
},
};
ReplicationTestEnv::setup();
ReplicationTestEnv::openlog();
my $ctime = 1000;
for (my $i = 0; $i < 15; $i++) {
ReplicationTestEnv::track_jobs($ctime);
$ctime += 60;
}
ReplicationTestEnv::commit_log();
exit(0);