PVE::ReplicationTools - remove useless call to cfs_update

[pve-storage.git] / PVE / ReplicationTools.pm

diff --git a/PVE/ReplicationTools.pm b/PVE/ReplicationTools.pm
index c87aad2eb34954f9e82db44ff0f1fe35dc32d05e..3f5b6197f99a140c16b3b727ef1f7f7d762071de 100644 (file)
--- a/PVE/ReplicationTools.pm
+++ b/PVE/ReplicationTools.pm
@@ -17,7 +17,6 @@ use Data::Dumper qw(Dumper);
 my $STATE_DIR = '/var/lib/pve-replica';
 my $STATE_PATH = "$STATE_DIR/pve-replica.state";
 
-PVE::Cluster::cfs_update;
 my $local_node = PVE::INotify::nodename();
 
 my $cluster_nodes;
@@ -85,57 +84,32 @@ sub get_node_ip {
 }
 
 sub get_all_jobs {
-    my ($nodes) = @_;
-
-    my @nodelist = PVE::Tools::split_list($nodes);
 
     my $vms = PVE::Cluster::get_vmlist();
-    my $state = read_state();
-    my $jobs = {};
-
-    my $outfunc = sub {
-       my $line = shift;
-
-       my $remote_jobs = JSON::decode_json($line);
-       foreach my $vmid (keys %$remote_jobs) {
-           $jobs->{$vmid} = $remote_jobs->{$vmid};
-       }
-    };
-
-    foreach my $node (@nodelist) {
-       if ($local_node ne $node) {
 
-           my $ip = get_node_ip($node);
-           $ip = [$ip] if Net::IP::ip_is_ipv6($ip);
-
-           my @cmd = ('ssh', '-o', 'Batchmode=yes', "root\@$ip", '--',
-                      'pvesr', 'list', '--json');
-
-           run_command([@cmd], outfunc=>$outfunc)
+    my $state = read_state();
 
-       } else {
+    my $jobs = {};
 
-           foreach my $vmid (keys %{$vms->{ids}}) {
+    foreach my $vmid (keys %{$vms->{ids}}) {
+       next if $vms->{ids}->{$vmid}->{node} ne $local_node;
 
-               next if !($vms->{ids}->{$vmid}->{node} eq $local_node);
-               next if !defined($state->{$vmid});
-               my $vm_state = $state->{$vmid};
-               my $job = {};
+       my $vm_state = $state->{$vmid};
+       next if !defined($vm_state);
 
-               $job->{limit}    = $vm_state->{limit};
-               $job->{interval} = $vm_state->{interval};
-               $job->{tnode}    = $vm_state->{tnode};
-               $job->{lastsync} = $vm_state->{lastsync};
-               $job->{state}    = $vm_state->{state};
-               $job->{fail}     = $vm_state->{fail};
+       my $job = {};
 
-               $jobs->{$vmid}   = $job;
-           }
+       $job->{limit}    = $vm_state->{limit};
+       $job->{interval} = $vm_state->{interval};
+       $job->{tnode}    = $vm_state->{tnode};
+       $job->{lastsync} = $vm_state->{lastsync};
+       $job->{state}    = $vm_state->{state};
+       $job->{fail}     = $vm_state->{fail};
 
-       }
+       $jobs->{$vmid}   = $job;
     }
 
-    return ($jobs);
+    return $jobs;
 }
 
 sub sync_guest {
@@ -381,6 +355,7 @@ sub get_syncable_guestdisks {
     my $warnings = 0;
     my $func = sub {
        my ($id, $volume) = @_;
+       return if !defined($volume->{replica}) || !$volume->{replica};
 
        my $volname;
        if ($vm_type eq 'qemu') {
@@ -392,9 +367,7 @@ sub get_syncable_guestdisks {
        if( PVE::Storage::volume_has_feature($cfg, 'replicate', $volname , undef, $running)) {
            $syncable_disks->{$volname} = 1;
        } else {
-           warn "Can't sync Volume: $volname\n"
-               if !$noerr &&
-                  (!defined($volume->{replica}) || $volume->{replica});
+           warn "Can't sync Volume: $volname\n" if !$noerr;
            $warnings = 1;
        }
     };