From 9998ea1d52a14c89303527941638841385bad43a Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 9 May 2017 07:11:07 +0200 Subject: [PATCH] ReplicationTools.pm: call PVE::INotify::nodename inside methods so that we can overwrite it using Test::MockModule. This makes writing regression tests easier. --- PVE/ReplicationTools.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PVE/ReplicationTools.pm b/PVE/ReplicationTools.pm index 8cd4007..2953e13 100644 --- a/PVE/ReplicationTools.pm +++ b/PVE/ReplicationTools.pm @@ -17,8 +17,6 @@ use PVE::Storage; my $STATE_DIR = '/var/lib/pve-replica'; my $STATE_PATH = "$STATE_DIR/pve-replica.state"; -my $local_node = PVE::INotify::nodename(); - my $get_ssh_cmd = sub { my ($ip) = @_; @@ -100,6 +98,8 @@ sub get_all_jobs { my $jobs = {}; + my $local_node = PVE::INotify::nodename(); + foreach my $vmid (keys %{$vms->{ids}}) { next if $vms->{ids}->{$vmid}->{node} ne $local_node; my $vm_state = $state->{$vmid}; @@ -123,6 +123,8 @@ sub get_all_jobs { sub sync_guest { my ($vmid, $param) = @_; + my $local_node = PVE::INotify::nodename(); + my $jobs = read_state(); $jobs->{$vmid}->{state} = 'sync'; write_state($jobs); @@ -262,6 +264,8 @@ sub send_image { sub job_enable { my ($vmid, $no_sync, $target) = @_; + my $local_node = PVE::INotify::nodename(); + my $update_state = sub { my ($state) = @_;