Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

replication: add last_node to replication state

Browse Source 
So that we know which node produced the state. This is not always
the local node, because we copy the state on migrate.
This commit is contained in:
Dietmar Maurer 2017-06-06 06:49:05 +02:00
parent da95168678
commit c823e097ac
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PVE/Replication.pm
View File

@ -368,6 +368,7 @@ my $run_replication_nolock = sub {
$state->{pid} = $$;
$state->{ptime} = PVE::ProcFSTools::read_proc_starttime($state->{pid});
$state->{last_node} = PVE::INotify::nodename();
$state->{last_try} = $start_time;
$state->{last_iteration} = $iteration;

2
bin/test/ReplicationTestEnv.pm
View File

@ -296,7 +296,7 @@ sub track_jobs {
my $state = $jobcfg->{state};
my $changes = '';
foreach my $k (qw(last_try last_sync fail_count error)) {
foreach my $k (qw(last_node last_try last_sync fail_count error)) {
if (($oldstate->{$k} // '') ne ($state->{$k} // '')) {
my $value = $state->{$k} // '';
chomp $value;

2
bin/test/replication_test4.log
View File

@ -2,7 +2,7 @@
1000 job_900_to_node2: start replication job
1000 job_900_to_node2: end replication job with error: faked replication error
1000 job_900_to_node2: changed config next_sync => 1300
1000 job_900_to_node2: changed state last_try => 1000, fail_count => 1, error => faked replication error
1000 job_900_to_node2: changed state last_node => node1, last_try => 1000, fail_count => 1, error => faked replication error
1300 job_900_to_node2: start replication job
1300 job_900_to_node2: end replication job with error: faked replication error
1300 job_900_to_node2: changed config next_sync => 1900

2
bin/test/replication_test5.log
View File

@ -6,7 +6,7 @@
1000 job_900_to_node2: full sync 'local-zfs:vm-900-disk-1' (replicate_job_900_to_node2_1000_snap)
1000 job_900_to_node2: end replication job
1000 job_900_to_node2: changed config next_sync => 1800
1000 job_900_to_node2: changed state last_try => 1000, last_sync => 1000
1000 job_900_to_node2: changed state last_node => node1, last_try => 1000, last_sync => 1000
1840 job_900_to_node2: start replication job
1840 job_900_to_node2: guest => 900, type => qemu, running => 0
1840 job_900_to_node2: volumes => local-zfs:vm-900-disk-1