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

PVE::Replication - do not pass time to logfunc

Browse Source 
This is simply not neccessary.
This commit is contained in:
Dietmar Maurer 2017-06-06 06:36:03 +02:00
parent fe5ba666ae
commit da95168678
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/CLI/pvesr.pm
View File

@ -100,7 +100,7 @@ __PACKAGE__->register_method ({
$volids = [ sort @$volids ];
my $logfunc = sub {
my ($start_time, $msg) = @_;
my ($msg) = @_;
print STDERR "$msg\n";
};
@ -111,7 +111,7 @@ __PACKAGE__->register_method ({
foreach my $info (@{$dl->{$storeid}}) {
my $volid = $info->{volid};
next if grep { $_ eq $volid } @$volids;
$logfunc->(undef, "$jobid: delete stale volume '$volid'");
$logfunc->("$jobid: delete stale volume '$volid'");
PVE::Storage::vdisk_free($storecfg, $volid);
}
}
@ -182,7 +182,7 @@ __PACKAGE__->register_method ({
$volids = [ sort @$volids ];
my $logfunc = sub {
my ($start_time, $msg) = @_;
my ($msg) = @_;
print STDERR "$msg\n";
};
@ -217,7 +217,7 @@ __PACKAGE__->register_method ({
if ($param->{verbose}) {
$logfunc = sub {
my ($start_time, $msg) = @_;
my ($msg) = @_;
print "$msg\n";
};
}

28
PVE/Replication.pm
View File

@ -169,7 +169,7 @@ sub prepare {
if ($snap eq $snapname) {
$last_snapshots->{$volid} = 1;
} else {
$logfunc->($start_time, "$jobid: delete stale snapshot '$snap' on $volid");
$logfunc->("$jobid: delete stale snapshot '$snap' on $volid");
PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snap);
}
}
@ -248,12 +248,12 @@ sub replicate {
my $sorted_volids = [ sort keys %$volumes ];
$logfunc->($start_time, "$jobid: guest => $vmid, type => $vmtype, running => $running");
$logfunc->($start_time, "$jobid: volumes => " . join(',', @$sorted_volids));
$logfunc->("$jobid: guest => $vmid, type => $vmtype, running => $running");
$logfunc->("$jobid: volumes => " . join(',', @$sorted_volids));
if (my $remove_job = $jobcfg->{remove_job}) {
$logfunc->($start_time, "$jobid: start job removal - mode '${remove_job}'");
$logfunc->("$jobid: start job removal - mode '${remove_job}'");
if ($remove_job eq 'full' && $jobcfg->{target} ne $local_node) {
# remove all remote volumes
@ -265,7 +265,7 @@ sub replicate {
prepare($storecfg, $sorted_volids, $jobid, 0, $start_time, $logfunc);
delete_job($jobid); # update config
$logfunc->($start_time, "$jobid: job removed");
$logfunc->("$jobid: job removed");
return;
}
@ -286,7 +286,7 @@ sub replicate {
# freeze filesystem for data consistency
if ($qga) {
$logfunc->($start_time, "$jobid: freeze guest filesystem");
$logfunc->("$jobid: freeze guest filesystem");
PVE::QemuServer::vm_mon_cmd($vmid, "guest-fsfreeze-freeze");
}
@ -294,7 +294,7 @@ sub replicate {
my $replicate_snapshots = {};
eval {
foreach my $volid (@$sorted_volids) {
$logfunc->($start_time, "$jobid: create snapshot '${sync_snapname}' on $volid");
$logfunc->("$jobid: create snapshot '${sync_snapname}' on $volid");
PVE::Storage::volume_snapshot($storecfg, $volid, $sync_snapname);
$replicate_snapshots->{$volid} = 1;
}
@ -303,7 +303,7 @@ sub replicate {
# unfreeze immediately
if ($qga) {
$logfunc->($start_time, "$jobid: unfreeze guest filesystem");
$logfunc->("$jobid: unfreeze guest filesystem");
eval { PVE::QemuServer::vm_mon_cmd($vmid, "guest-fsfreeze-thaw"); };
warn $@ if $@; # ignore errors here, because we cannot fix it anyways
}
@ -311,7 +311,7 @@ sub replicate {
my $cleanup_local_snapshots = sub {
my ($volid_hash, $snapname) = @_;
foreach my $volid (sort keys %$volid_hash) {
$logfunc->($start_time, "$jobid: delete snapshot '$snapname' on $volid");
$logfunc->("$jobid: delete snapshot '$snapname' on $volid");
eval { PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snapname, $running); };
warn $@ if $@;
}
@ -330,10 +330,10 @@ sub replicate {
foreach my $volid (@$sorted_volids) {
my $base_snapname;
if ($last_snapshots->{$volid} && $remote_snapshots->{$volid}) {
$logfunc->($start_time, "$jobid: incremental sync '$volid' ($last_sync_snapname => $sync_snapname)");
$logfunc->("$jobid: incremental sync '$volid' ($last_sync_snapname => $sync_snapname)");
$base_snapname = $last_sync_snapname;
} else {
$logfunc->($start_time, "$jobid: full sync '$volid' ($sync_snapname)");
$logfunc->("$jobid: full sync '$volid' ($sync_snapname)");
}
replicate_volume($ssh_info, $storecfg, $volid, $base_snapname, $sync_snapname, $rate, $insecure);
}
@ -373,7 +373,7 @@ my $run_replication_nolock = sub {
PVE::ReplicationState::write_job_state($jobcfg, $state);
$logfunc->($start_time, "$jobcfg->{id}: start replication job") if $logfunc;
$logfunc->("$jobcfg->{id}: start replication job") if $logfunc;
eval {
replicate($jobcfg, $state->{last_sync}, $start_time, $logfunc);
@ -391,12 +391,12 @@ my $run_replication_nolock = sub {
PVE::ReplicationState::write_job_state($jobcfg, $state);
my $msg = "$jobcfg->{id}: end replication job with error: $err";
if ($logfunc) {
$logfunc->($start_time, $msg);
$logfunc->($msg);
} else {
warn "$msg\n";
}
} else {
$logfunc->($start_time, "$jobcfg->{id}: end replication job") if $logfunc;
$logfunc->("$jobcfg->{id}: end replication job") if $logfunc;
$state->{last_sync} = $start_time;
$state->{fail_count} = 0;
delete $state->{error};

26
bin/test/ReplicationTestEnv.pm
View File

@ -226,13 +226,6 @@ sub openlog {
$logfh = $fh;
}
sub logmsg {
my ($ctime, $msg) = @_;
print "$ctime $msg\n";
print $logfh "$ctime $msg\n";
}
sub commit_log {
close($logfh);
@ -256,22 +249,29 @@ my $status;
sub track_jobs {
my ($ctime) = @_;
my $logmsg = sub {
my ($msg) = @_;
print "$ctime $msg\n";
print $logfh "$ctime $msg\n";
};
if (!$status) {
$status = PVE::Replication::job_status();
foreach my $jobid (sort keys %$status) {
my $jobcfg = $status->{$jobid};
logmsg($ctime, "$jobid: new job next_sync => $jobcfg->{next_sync}");
$logmsg->("$jobid: new job next_sync => $jobcfg->{next_sync}");
}
}
PVE::Replication::run_jobs($ctime, \&logmsg);
PVE::Replication::run_jobs($ctime, $logmsg);
my $new = PVE::Replication::job_status();
# detect removed jobs
foreach my $jobid (sort keys %$status) {
if (!$new->{$jobid}) {
logmsg($ctime, "$jobid: vanished job");
$logmsg->("$jobid: vanished job");
}
}
@ -279,7 +279,7 @@ sub track_jobs {
my $jobcfg = $new->{$jobid};
my $oldcfg = $status->{$jobid};
if (!$oldcfg) {
logmsg($ctime, "$jobid: new job next_sync => $jobcfg->{next_sync}");
$logmsg->("$jobid: new job next_sync => $jobcfg->{next_sync}");
next; # no old state to compare
} else {
foreach my $k (qw(target guest vmtype next_sync)) {
@ -288,7 +288,7 @@ sub track_jobs {
$changes .= ', ' if $changes;
$changes .= "$k => $jobcfg->{$k}";
}
logmsg($ctime, "$jobid: changed config $changes") if $changes;
$logmsg->("$jobid: changed config $changes") if $changes;
}
}
@ -304,7 +304,7 @@ sub track_jobs {
$changes .= "$k => $value";
}
}
logmsg($ctime, "$jobid: changed state $changes") if $changes;
$logmsg->("$jobid: changed state $changes") if $changes;
}
$status = $new;