X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FReplicationState.pm;h=1e74809a00999f2d7a6d03070c72dd1eedb1a160;hb=22ce136731b2b649b79d3415343363798ce22d2f;hp=8e30e07498505082940e3f89a9834f62b2376a87;hpb=2c508173eab538479b6ab702be294dd22122d460;p=pve-guest-common.git diff --git a/PVE/ReplicationState.pm b/PVE/ReplicationState.pm index 8e30e07..1e74809 100644 --- a/PVE/ReplicationState.pm +++ b/PVE/ReplicationState.pm @@ -147,6 +147,18 @@ sub record_job_start { write_job_state($jobcfg, $state); } +sub delete_guest_states { + my ($vmid) = @_; + + my $code = sub { + my $stateobj = read_state(); + delete $stateobj->{$vmid}; + PVE::Tools::file_set_contents($state_path, encode_json($stateobj)); + }; + + PVE::Tools::lock_file($state_lock, 10, $code); +} + sub record_job_end { my ($jobcfg, $state, $start_time, $duration, $err) = @_; @@ -158,12 +170,17 @@ sub record_job_end { chomp $err; $state->{fail_count}++; $state->{error} = "$err"; + write_job_state($jobcfg, $state); } else { - $state->{last_sync} = $start_time; - $state->{fail_count} = 0; - delete $state->{error}; + if ($jobcfg->{remove_job}) { + write_job_state($jobcfg, undef); + } else { + $state->{last_sync} = $start_time; + $state->{fail_count} = 0; + delete $state->{error}; + write_job_state($jobcfg, $state); + } } - write_job_state($jobcfg, $state); } sub replication_snapshot_name { @@ -175,6 +192,40 @@ sub replication_snapshot_name { wantarray ? ($prefix, $snapname) : $snapname; } +sub purge_old_states { + + my $local_node = PVE::INotify::nodename(); + + my $cfg = PVE::ReplicationConfig->new(); + my $vms = PVE::Cluster::get_vmlist(); + + my $used_tids = {}; + + foreach my $jobid (sort keys %{$cfg->{ids}}) { + my $jobcfg = $cfg->{ids}->{$jobid}; + my $plugin = PVE::ReplicationConfig->lookup($jobcfg->{type}); + my $tid = $plugin->get_unique_target_id($jobcfg); + my $vmid = $jobcfg->{guest}; + $used_tids->{$vmid}->{$tid} = 1 + if defined($vms->{ids}->{$vmid}); # && $vms->{ids}->{$vmid}->{node} eq $local_node; + } + + my $purge_state = sub { + my $stateobj = read_state(); + my $next_stateobj = {}; + + foreach my $vmid (keys %$stateobj) { + foreach my $tid (keys %{$stateobj->{$vmid}}) { + $next_stateobj->{$vmid}->{$tid} = $stateobj->{$vmid}->{$tid} if $used_tids->{$vmid}->{$tid}; + } + } + PVE::Tools::file_set_contents($state_path, encode_json($next_stateobj)); + }; + + PVE::Tools::lock_file($state_lock, 10, $purge_state); + die $@ if $@; +} + sub job_status { my $local_node = PVE::INotify::nodename(); @@ -199,9 +250,10 @@ 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}) { # never sync to local node - next if $jobcfg->{target} eq $local_node; + next if $target eq $local_node; next if $jobcfg->{disable}; } @@ -218,8 +270,9 @@ sub job_status { # todo: consider fail_count? How many retries? } else { if (my $fail_count = $state->{fail_count}) { - if ($fail_count < 3) { - $next_sync = $state->{last_try} + 5*60*$fail_count; + my $members = PVE::Cluster::get_members(); + if (!$fail_count || ($members->{$target} && $members->{$target}->{online})) { + $next_sync = $state->{last_try} + 60*($fail_count < 3 ? 5*$fail_count : 30); } } else { my $schedule = $jobcfg->{schedule} || '*/15'; @@ -246,7 +299,7 @@ sub get_next_job { my $jobb = $jobs->{$b}; my $sa = $joba->{state}; my $sb = $jobb->{state}; - my $res = $sa->{last_iteration} cmp $sb->{last_iteration}; + my $res = $sa->{last_iteration} <=> $sb->{last_iteration}; return $res if $res != 0; $res = $joba->{next_sync} <=> $jobb->{next_sync}; return $res if $res != 0; @@ -264,4 +317,22 @@ sub get_next_job { return undef; } +sub schedule_job_now { + my ($jobcfg) = @_; + PVE::GuestHelpers::guest_migration_lock($jobcfg->{guest}, undef, sub { + PVE::Tools::lock_file($state_lock, 10, sub { + my $stateobj = read_state(); + my $vmid = $jobcfg->{guest}; + my $tid = $plugin->get_unique_target_id($jobcfg); + # no not modify anything if there is no state + return if !defined($stateobj->{$vmid}->{$tid}); + + my $state = read_job_state($jobcfg); + $state->{last_try} = 0; + write_job_state($jobcfg, $state); + }); + die $@ if $@; + }); +} + 1;