cyteen
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use capture::tiny for teeing commands

This commit is contained in:
Christoph Klaffl 2019-05-16 18:42:26 +02:00
parent f7bd267a6b
commit 1046f7f58e
No known key found for this signature in database
GPG Key ID: FC1C525C2A47CC28
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
syncoid
View File

@ -13,6 +13,7 @@ use Getopt::Long qw(:config auto_version auto_help);
use Pod::Usage; use Pod::Usage;
use Time::Local; use Time::Local;
use Sys::Hostname; use Sys::Hostname;
use Capture::Tiny ':all';
my $mbuffer_size = "16M"; my $mbuffer_size = "16M";
@ -672,10 +673,15 @@ sub syncdataset {
if (!$quiet) { print "Sending incremental $sourcefs#$bookmarkescaped ... $nextsnapshot (~ $disp_pvsize):\n"; } if (!$quiet) { print "Sending incremental $sourcefs#$bookmarkescaped ... $nextsnapshot (~ $disp_pvsize):\n"; }
if ($debug) { print "DEBUG: $synccmd\n"; } if ($debug) { print "DEBUG: $synccmd\n"; }
my $output = `$synccmd 2>&1`; my $stdout;
my $stderr;
my $exit;
($stdout, $stderr, $exit) = tee {
system("$synccmd")
};
$? == 0 or do { $exit == 0 or do {
if (!$resume && $output =~ /\Qcontains partially-complete state\E/) { if (!$resume && $stderr =~ /\Qcontains partially-complete state\E/) {
if (!$quiet) { print "WARN: resetting partially receive state\n"; } if (!$quiet) { print "WARN: resetting partially receive state\n"; }
resetreceivestate($targethost,$targetfs,$targetisroot); resetreceivestate($targethost,$targetfs,$targetisroot);
system("$synccmd") == 0 or do { system("$synccmd") == 0 or do {
@ -700,10 +706,15 @@ sub syncdataset {
if (!$quiet) { print "Sending incremental $sourcefs#$bookmarkescaped ... $newsyncsnap (~ $disp_pvsize):\n"; } if (!$quiet) { print "Sending incremental $sourcefs#$bookmarkescaped ... $newsyncsnap (~ $disp_pvsize):\n"; }
if ($debug) { print "DEBUG: $synccmd\n"; } if ($debug) { print "DEBUG: $synccmd\n"; }
my $output = `$synccmd 2>&1`; my $stdout;
my $stderr;
my $exit;
($stdout, $stderr, $exit) = tee {
system("$synccmd")
};
$? == 0 or do { $exit == 0 or do {
if (!$resume && $output =~ /\Qcontains partially-complete state\E/) { if (!$resume && $stderr =~ /\Qcontains partially-complete state\E/) {
if (!$quiet) { print "WARN: resetting partially receive state\n"; } if (!$quiet) { print "WARN: resetting partially receive state\n"; }
resetreceivestate($targethost,$targetfs,$targetisroot); resetreceivestate($targethost,$targetfs,$targetisroot);
system("$synccmd") == 0 or do { system("$synccmd") == 0 or do {
@ -739,10 +750,15 @@ sub syncdataset {
if (!$quiet) { print "Sending incremental $sourcefs\@$matchingsnap ... $newsyncsnap (~ $disp_pvsize):\n"; } if (!$quiet) { print "Sending incremental $sourcefs\@$matchingsnap ... $newsyncsnap (~ $disp_pvsize):\n"; }
if ($debug) { print "DEBUG: $synccmd\n"; } if ($debug) { print "DEBUG: $synccmd\n"; }
my $output = `$synccmd 2>&1`; my $stdout;
my $stderr;
my $exit;
($stdout, $stderr, $exit) = tee {
system("$synccmd")
};
$? == 0 or do { $exit == 0 or do {
if (!$resume && $output =~ /\Qcontains partially-complete state\E/) { if (!$resume && $stderr =~ /\Qcontains partially-complete state\E/) {
if (!$quiet) { print "WARN: resetting partially receive state\n"; } if (!$quiet) { print "WARN: resetting partially receive state\n"; }
resetreceivestate($targethost,$targetfs,$targetisroot); resetreceivestate($targethost,$targetfs,$targetisroot);
system("$synccmd") == 0 or do { system("$synccmd") == 0 or do {