escape filesystem names as needed to avoid interpreting special characters like whitespace and stop
interpreting metacharacters in fs names for some regular expressions, fixes #40
This commit is contained in:
Christoph Klaffl
parent
09a879664a
commit
e260f9095f
191
syncoid
191
syncoid
|
|
@ -97,7 +97,7 @@ if (! $args{'recursive'}) {
|
|||
if ($debug) { print "DEBUG: recursive sync of $sourcefs.\n"; }
|
||||
my @datasets = getchilddatasets($sourcehost, $sourcefs, $sourceisroot);
|
||||
foreach my $dataset(@datasets) {
|
||||
$dataset =~ s/$sourcefs//;
|
||||
$dataset =~ s/\Q$sourcefs\E//;
|
||||
chomp $dataset;
|
||||
my $childsourcefs = $sourcefs . $dataset;
|
||||
my $childtargetfs = $targetfs . $dataset;
|
||||
|
|
@ -126,11 +126,16 @@ exit 0;
|
|||
sub getchilddatasets {
|
||||
my ($rhost,$fs,$isroot,%snaps) = @_;
|
||||
my $mysudocmd;
|
||||
my $fsescaped = escapeshellparam($fs);
|
||||
|
||||
if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; }
|
||||
if ($rhost ne '') { $rhost = "$sshcmd $rhost"; }
|
||||
if ($rhost ne '') {
|
||||
$rhost = "$sshcmd $rhost";
|
||||
# double escaping needed
|
||||
$fsescaped = escapeshellparam($fsescaped);
|
||||
}
|
||||
|
||||
my $getchildrencmd = "$rhost $mysudocmd $zfscmd list -o name -t filesystem,volume -Hr $fs |";
|
||||
my $getchildrencmd = "$rhost $mysudocmd $zfscmd list -o name -t filesystem,volume -Hr $fsescaped |";
|
||||
if ($debug) { print "DEBUG: getting list of child datasets on $fs using $getchildrencmd...\n"; }
|
||||
open FH, $getchildrencmd;
|
||||
my @children = <FH>;
|
||||
|
|
@ -143,6 +148,9 @@ sub syncdataset {
|
|||
|
||||
my ($sourcehost, $sourcefs, $targethost, $targetfs) = @_;
|
||||
|
||||
my $sourcefsescaped = escapeshellparam($sourcefs);
|
||||
my $targetfsescaped = escapeshellparam($targetfs);
|
||||
|
||||
if ($debug) { print "DEBUG: syncing source $sourcefs to target $targetfs.\n"; }
|
||||
|
||||
# make sure target is not currently in receive.
|
||||
|
|
@ -209,8 +217,8 @@ sub syncdataset {
|
|||
# if --no-stream is specified, our full needs to be the newest snapshot, not the oldest.
|
||||
if (defined $args{'no-stream'}) { $oldestsnap = getnewestsnapshot(\%snaps); }
|
||||
|
||||
my $sendcmd = "$sourcesudocmd $zfscmd send $sourcefs\@$oldestsnap";
|
||||
my $recvcmd = "$targetsudocmd $zfscmd receive -F $targetfs";
|
||||
my $sendcmd = "$sourcesudocmd $zfscmd send $sourcefsescaped\@$oldestsnap";
|
||||
my $recvcmd = "$targetsudocmd $zfscmd receive -F $targetfsescaped";
|
||||
|
||||
my $pvsize = getsendsize($sourcehost,"$sourcefs\@$oldestsnap",0,$sourceisroot);
|
||||
my $disp_pvsize = readablebytes($pvsize);
|
||||
|
|
@ -245,7 +253,7 @@ sub syncdataset {
|
|||
# $originaltargetreadonly = getzfsvalue($targethost,$targetfs,$targetisroot,'readonly');
|
||||
# setzfsvalue($targethost,$targetfs,$targetisroot,'readonly','on');
|
||||
|
||||
$sendcmd = "$sourcesudocmd $zfscmd send $args{'streamarg'} $sourcefs\@$oldestsnap $sourcefs\@$newsyncsnap";
|
||||
$sendcmd = "$sourcesudocmd $zfscmd send $args{'streamarg'} $sourcefsescaped\@$oldestsnap $sourcefsescaped\@$newsyncsnap";
|
||||
$pvsize = getsendsize($sourcehost,"$sourcefs\@$oldestsnap","$sourcefs\@$newsyncsnap",$sourceisroot);
|
||||
$disp_pvsize = readablebytes($pvsize);
|
||||
if ($pvsize == 0) { $disp_pvsize = "UNKNOWN"; }
|
||||
|
|
@ -305,15 +313,15 @@ sub syncdataset {
|
|||
# rollback target to matchingsnap
|
||||
if ($debug) { print "DEBUG: rolling back target to $targetfs\@$matchingsnap...\n"; }
|
||||
if ($targethost ne '') {
|
||||
if ($debug) { print "$sshcmd $targethost $targetsudocmd $zfscmd rollback -R $targetfs\@$matchingsnap\n"; }
|
||||
system ("$sshcmd $targethost $targetsudocmd $zfscmd rollback -R $targetfs\@$matchingsnap");
|
||||
if ($debug) { print "$sshcmd $targethost $targetsudocmd $zfscmd rollback -R $targetfsescaped\@$matchingsnap\n"; }
|
||||
system ("$sshcmd $targethost " . escapeshellparam("$targetsudocmd $zfscmd rollback -R $targetfsescaped\@$matchingsnap"));
|
||||
} else {
|
||||
if ($debug) { print "$targetsudocmd $zfscmd rollback -R $targetfs\@$matchingsnap\n"; }
|
||||
system ("$targetsudocmd $zfscmd rollback -R $targetfs\@$matchingsnap");
|
||||
if ($debug) { print "$targetsudocmd $zfscmd rollback -R $targetfsescaped\@$matchingsnap\n"; }
|
||||
system ("$targetsudocmd $zfscmd rollback -R $targetfsescaped\@$matchingsnap");
|
||||
}
|
||||
|
||||
my $sendcmd = "$sourcesudocmd $zfscmd send $args{'streamarg'} $sourcefs\@$matchingsnap $sourcefs\@$newsyncsnap";
|
||||
my $recvcmd = "$targetsudocmd $zfscmd receive -F $targetfs";
|
||||
my $sendcmd = "$sourcesudocmd $zfscmd send $args{'streamarg'} $sourcefsescaped\@$matchingsnap $sourcefsescaped\@$newsyncsnap";
|
||||
my $recvcmd = "$targetsudocmd $zfscmd receive -F $targetfsescaped";
|
||||
my $pvsize = getsendsize($sourcehost,"$sourcefs\@$matchingsnap","$sourcefs\@$newsyncsnap",$sourceisroot);
|
||||
my $disp_pvsize = readablebytes($pvsize);
|
||||
if ($pvsize == 0) { $disp_pvsize = "UNKNOWN"; }
|
||||
|
|
@ -590,7 +598,7 @@ sub iszfsbusy {
|
|||
|
||||
foreach my $process (@processes) {
|
||||
# if ($debug) { print "DEBUG: checking process $process...\n"; }
|
||||
if ($process =~ /zfs *(receive|recv).*$fs/) {
|
||||
if ($process =~ /zfs *(receive|recv).*\Q$fs\E/) {
|
||||
# there's already a zfs receive process for our target filesystem - return true
|
||||
if ($debug) { print "DEBUG: process $process matches target $fs!\n"; }
|
||||
return 1;
|
||||
|
|
@ -603,24 +611,40 @@ sub iszfsbusy {
|
|||
|
||||
sub setzfsvalue {
|
||||
my ($rhost,$fs,$isroot,$property,$value) = @_;
|
||||
if ($rhost ne '') { $rhost = "$sshcmd $rhost"; }
|
||||
|
||||
my $fsescaped = escapeshellparam($fs);
|
||||
|
||||
if ($rhost ne '') {
|
||||
$rhost = "$sshcmd $rhost";
|
||||
# double escaping needed
|
||||
$fsescaped = escapeshellparam($fsescaped);
|
||||
}
|
||||
|
||||
if ($debug) { print "DEBUG: setting $property to $value on $fs...\n"; }
|
||||
my $mysudocmd;
|
||||
if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; }
|
||||
if ($debug) { print "$rhost $mysudocmd $zfscmd set $property=$value $fs\n"; }
|
||||
system("$rhost $mysudocmd $zfscmd set $property=$value $fs") == 0
|
||||
or warn "WARNING: $rhost $mysudocmd $zfscmd set $property=$value $fs died: $?, proceeding anyway.\n";
|
||||
if ($debug) { print "$rhost $mysudocmd $zfscmd set $property=$value $fsescaped\n"; }
|
||||
system("$rhost $mysudocmd $zfscmd set $property=$value $fsescaped") == 0
|
||||
or warn "WARNING: $rhost $mysudocmd $zfscmd set $property=$value $fsescaped died: $?, proceeding anyway.\n";
|
||||
return;
|
||||
}
|
||||
|
||||
sub getzfsvalue {
|
||||
my ($rhost,$fs,$isroot,$property) = @_;
|
||||
if ($rhost ne '') { $rhost = "$sshcmd $rhost"; }
|
||||
|
||||
my $fsescaped = escapeshellparam($fs);
|
||||
|
||||
if ($rhost ne '') {
|
||||
$rhost = "$sshcmd $rhost";
|
||||
# double escaping needed
|
||||
$fsescaped = escapeshellparam($fsescaped);
|
||||
}
|
||||
|
||||
if ($debug) { print "DEBUG: getting current value of $property on $fs...\n"; }
|
||||
my $mysudocmd;
|
||||
if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; }
|
||||
if ($debug) { print "$rhost $mysudocmd $zfscmd get -H $property $fs\n"; }
|
||||
open FH, "$rhost $mysudocmd $zfscmd get -H $property $fs |";
|
||||
if ($debug) { print "$rhost $mysudocmd $zfscmd get -H $property $fsescaped\n"; }
|
||||
open FH, "$rhost $mysudocmd $zfscmd get -H $property $fsescaped |";
|
||||
my $value = <FH>;
|
||||
close FH;
|
||||
my @values = split(/\s/,$value);
|
||||
|
|
@ -706,17 +730,24 @@ sub buildsynccmd {
|
|||
if ($avail{'localpv'} && !$quiet) { $synccmd .= " $pvcmd -s $pvsize |"; }
|
||||
if ($avail{'compress'}) { $synccmd .= " $args{'compresscmd'} |"; }
|
||||
if ($avail{'sourcembuffer'}) { $synccmd .= " $mbuffercmd $args{'source-bwlimit'} $mbufferoptions |"; }
|
||||
$synccmd .= " $sshcmd $targethost '";
|
||||
if ($avail{'targetmbuffer'}) { $synccmd .= " $mbuffercmd $args{'target-bwlimit'} $mbufferoptions |"; }
|
||||
if ($avail{'compress'}) { $synccmd .= " $args{'decompresscmd'} |"; }
|
||||
$synccmd .= " $recvcmd'";
|
||||
$synccmd .= " $sshcmd $targethost ";
|
||||
|
||||
my $remotecmd = "";
|
||||
if ($avail{'targetmbuffer'}) { $remotecmd .= " $mbuffercmd $args{'target-bwlimit'} $mbufferoptions |"; }
|
||||
if ($avail{'compress'}) { $remotecmd .= " $args{'decompresscmd'} |"; }
|
||||
$remotecmd .= " $recvcmd";
|
||||
|
||||
$synccmd .= escapeshellparam($remotecmd);
|
||||
} elsif ($targethost eq '') {
|
||||
# remote source, local target.
|
||||
#$synccmd = "$sshcmd $sourcehost '$sendcmd | $args{'compresscmd'} | $mbuffercmd' | $args{'decompresscmd'} | $mbuffercmd | $pvcmd | $recvcmd";
|
||||
$synccmd = "$sshcmd $sourcehost '$sendcmd";
|
||||
if ($avail{'compress'}) { $synccmd .= " | $args{'compresscmd'}"; }
|
||||
if ($avail{'sourcembuffer'}) { $synccmd .= " | $mbuffercmd $args{'source-bwlimit'} $mbufferoptions"; }
|
||||
$synccmd .= "' | ";
|
||||
|
||||
my $remotecmd = $sendcmd;
|
||||
if ($avail{'compress'}) { $remotecmd .= " | $args{'compresscmd'}"; }
|
||||
if ($avail{'sourcembuffer'}) { $remotecmd .= " | $mbuffercmd $args{'source-bwlimit'} $mbufferoptions"; }
|
||||
|
||||
$synccmd = "$sshcmd $sourcehost " . escapeshellparam($remotecmd);
|
||||
$synccmd .= " | ";
|
||||
if ($avail{'targetmbuffer'}) { $synccmd .= "$mbuffercmd $args{'target-bwlimit'} $mbufferoptions | "; }
|
||||
if ($avail{'compress'}) { $synccmd .= "$args{'decompresscmd'} | "; }
|
||||
if ($avail{'localpv'} && !$quiet) { $synccmd .= "$pvcmd -s $pvsize | "; }
|
||||
|
|
@ -724,25 +755,37 @@ sub buildsynccmd {
|
|||
} else {
|
||||
#remote source, remote target... weird, but whatever, I'm not here to judge you.
|
||||
#$synccmd = "$sshcmd $sourcehost '$sendcmd | $args{'compresscmd'} | $mbuffercmd' | $args{'decompresscmd'} | $pvcmd | $args{'compresscmd'} | $mbuffercmd | $sshcmd $targethost '$args{'decompresscmd'} | $mbuffercmd | $recvcmd'";
|
||||
$synccmd = "$sshcmd $sourcehost '$sendcmd";
|
||||
if ($avail{'compress'}) { $synccmd .= " | $args{'compresscmd'}"; }
|
||||
if ($avail{'sourcembuffer'}) { $synccmd .= " | $mbuffercmd $args{'source-bwlimit'} $mbufferoptions"; }
|
||||
$synccmd .= "' | ";
|
||||
|
||||
my $remotecmd = $sendcmd;
|
||||
if ($avail{'compress'}) { $remotecmd .= " | $args{'compresscmd'}"; }
|
||||
if ($avail{'sourcembuffer'}) { $remotecmd .= " | $mbuffercmd $args{'source-bwlimit'} $mbufferoptions"; }
|
||||
|
||||
$synccmd = "$sshcmd $sourcehost " . escapeshellparam($remotecmd);
|
||||
$synccmd .= " | ";
|
||||
|
||||
if ($avail{'compress'}) { $synccmd .= "$args{'decompresscmd'} | "; }
|
||||
if ($avail{'localpv'} && !$quiet) { $synccmd .= "$pvcmd -s $pvsize | "; }
|
||||
if ($avail{'compress'}) { $synccmd .= "$args{'compresscmd'} | "; }
|
||||
if ($avail{'localmbuffer'}) { $synccmd .= "$mbuffercmd $mbufferoptions | "; }
|
||||
$synccmd .= "$sshcmd $targethost '";
|
||||
if ($avail{'targetmbuffer'}) { $synccmd .= "$mbuffercmd $args{'target-bwlimit'} $mbufferoptions | "; }
|
||||
if ($avail{'compress'}) { $synccmd .= "$args{'decompresscmd'} | "; }
|
||||
$synccmd .= "$recvcmd'";
|
||||
$synccmd .= "$sshcmd $targethost ";
|
||||
|
||||
$remotecmd = "";
|
||||
if ($avail{'targetmbuffer'}) { $remotecmd .= " $mbuffercmd $args{'target-bwlimit'} $mbufferoptions |"; }
|
||||
if ($avail{'compress'}) { $remotecmd .= " $args{'decompresscmd'} |"; }
|
||||
$remotecmd .= " $recvcmd";
|
||||
|
||||
$synccmd .= escapeshellparam($remotecmd);
|
||||
}
|
||||
return $synccmd;
|
||||
}
|
||||
|
||||
sub pruneoldsyncsnaps {
|
||||
my ($rhost,$fs,$newsyncsnap,$isroot,@snaps) = @_;
|
||||
|
||||
my $fsescaped = escapeshellparam($fs);
|
||||
|
||||
if ($rhost ne '') { $rhost = "$sshcmd $rhost"; }
|
||||
|
||||
my $hostid = hostname();
|
||||
|
||||
my $mysudocmd;
|
||||
|
|
@ -752,7 +795,7 @@ sub pruneoldsyncsnaps {
|
|||
|
||||
# only prune snaps beginning with syncoid and our own hostname
|
||||
foreach my $snap(@snaps) {
|
||||
if ($snap =~ /^syncoid_$hostid/) {
|
||||
if ($snap =~ /^syncoid_\Q$hostid\E/) {
|
||||
# no matter what, we categorically refuse to
|
||||
# prune the new sync snap we created for this run
|
||||
if ($snap ne $newsyncsnap) {
|
||||
|
|
@ -768,12 +811,14 @@ sub pruneoldsyncsnaps {
|
|||
my $prunecmd;
|
||||
foreach my $snap(@prunesnaps) {
|
||||
$counter ++;
|
||||
$prunecmd .= "$mysudocmd $zfscmd destroy $fs\@$snap; ";
|
||||
$prunecmd .= "$mysudocmd $zfscmd destroy $fsescaped\@$snap; ";
|
||||
if ($counter > $maxsnapspercmd) {
|
||||
$prunecmd =~ s/\; $//;
|
||||
if ($rhost ne '') { $prunecmd = '"' . $prunecmd . '"'; }
|
||||
if ($debug) { print "DEBUG: pruning up to $maxsnapspercmd obsolete sync snapshots...\n"; }
|
||||
if ($debug) { print "DEBUG: $rhost $prunecmd\n"; }
|
||||
if ($rhost ne '') {
|
||||
$prunecmd = escapeshellparam($prunecmd);
|
||||
}
|
||||
system("$rhost $prunecmd") == 0
|
||||
or warn "CRITICAL ERROR: $rhost $prunecmd failed: $?";
|
||||
$prunecmd = '';
|
||||
|
|
@ -784,9 +829,11 @@ sub pruneoldsyncsnaps {
|
|||
# the loop, commit 'em now
|
||||
if ($counter) {
|
||||
$prunecmd =~ s/\; $//;
|
||||
if ($rhost ne '') { $prunecmd = '"' . $prunecmd . '"'; }
|
||||
if ($debug) { print "DEBUG: pruning up to $maxsnapspercmd obsolete sync snapshots...\n"; }
|
||||
if ($debug) { print "DEBUG: $rhost $prunecmd\n"; }
|
||||
if ($rhost ne '') {
|
||||
$prunecmd = escapeshellparam($prunecmd);
|
||||
}
|
||||
system("$rhost $prunecmd") == 0
|
||||
or warn "WARNING: $rhost $prunecmd failed: $?";
|
||||
}
|
||||
|
|
@ -824,13 +871,18 @@ sub getmatchingsnapshot {
|
|||
|
||||
sub newsyncsnap {
|
||||
my ($rhost,$fs,$isroot) = @_;
|
||||
if ($rhost ne '') { $rhost = "$sshcmd $rhost"; }
|
||||
my $fsescaped = escapeshellparam($fs);
|
||||
if ($rhost ne '') {
|
||||
$rhost = "$sshcmd $rhost";
|
||||
# double escaping needed
|
||||
$fsescaped = escapeshellparam($fsescaped);
|
||||
}
|
||||
my $mysudocmd;
|
||||
if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; }
|
||||
my $hostid = hostname();
|
||||
my %date = getdate();
|
||||
my $snapname = "syncoid\_$hostid\_$date{'stamp'}";
|
||||
my $snapcmd = "$rhost $mysudocmd $zfscmd snapshot $fs\@$snapname\n";
|
||||
my $snapcmd = "$rhost $mysudocmd $zfscmd snapshot $fsescaped\@$snapname\n";
|
||||
system($snapcmd) == 0
|
||||
or die "CRITICAL ERROR: $snapcmd failed: $?";
|
||||
return $snapname;
|
||||
|
|
@ -838,16 +890,21 @@ sub newsyncsnap {
|
|||
|
||||
sub targetexists {
|
||||
my ($rhost,$fs,$isroot) = @_;
|
||||
if ($rhost ne '') { $rhost = "$sshcmd $rhost"; }
|
||||
my $fsescaped = escapeshellparam($fs);
|
||||
if ($rhost ne '') {
|
||||
$rhost = "$sshcmd $rhost";
|
||||
# double escaping needed
|
||||
$fsescaped = escapeshellparam($fsescaped);
|
||||
}
|
||||
my $mysudocmd;
|
||||
if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; }
|
||||
my $checktargetcmd = "$rhost $mysudocmd $zfscmd get -H name $fs";
|
||||
my $checktargetcmd = "$rhost $mysudocmd $zfscmd get -H name $fsescaped";
|
||||
if ($debug) { print "DEBUG: checking to see if target filesystem exists using \"$checktargetcmd 2>&1 |\"...\n"; }
|
||||
open FH, "$checktargetcmd 2>&1 |";
|
||||
my $targetexists = <FH>;
|
||||
close FH;
|
||||
my $exit = $?;
|
||||
$targetexists = ( $targetexists =~ /^$fs/ && $exit == 0 );
|
||||
$targetexists = ( $targetexists =~ /^\Q$fs\E/ && $exit == 0 );
|
||||
return $targetexists;
|
||||
}
|
||||
|
||||
|
|
@ -888,11 +945,16 @@ sub dumphash() {
|
|||
sub getsnaps() {
|
||||
my ($type,$rhost,$fs,$isroot,%snaps) = @_;
|
||||
my $mysudocmd;
|
||||
my $fsescaped = escapeshellparam($fs);
|
||||
if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; }
|
||||
|
||||
if ($rhost ne '') { $rhost = "$sshcmd $rhost"; }
|
||||
if ($rhost ne '') {
|
||||
$rhost = "$sshcmd $rhost";
|
||||
# double escaping needed
|
||||
$fsescaped = escapeshellparam($fsescaped);
|
||||
}
|
||||
|
||||
my $getsnapcmd = "$rhost $mysudocmd $zfscmd get -Hpd 1 -t snapshot guid,creation $fs |";
|
||||
my $getsnapcmd = "$rhost $mysudocmd $zfscmd get -Hpd 1 -t snapshot guid,creation $fsescaped |";
|
||||
if ($debug) { print "DEBUG: getting list of snapshots on $fs using $getsnapcmd...\n"; }
|
||||
open FH, $getsnapcmd;
|
||||
my @rawsnaps = <FH>;
|
||||
|
|
@ -903,24 +965,24 @@ sub getsnaps() {
|
|||
|
||||
foreach my $line (@rawsnaps) {
|
||||
# only import snap guids from the specified filesystem
|
||||
if ($line =~ /$fs\@.*guid/) {
|
||||
if ($line =~ /\Q$fs\E\@.*guid/) {
|
||||
chomp $line;
|
||||
my $guid = $line;
|
||||
$guid =~ s/^.*\sguid\s*(\d*).*/$1/;
|
||||
my $snap = $line;
|
||||
$snap =~ s/^\S*\@(\S*)\s*guid.*$/$1/;
|
||||
$snap =~ s/^.*\@(\S*)\s*guid.*$/$1/;
|
||||
$snaps{$type}{$snap}{'guid'}=$guid;
|
||||
}
|
||||
}
|
||||
|
||||
foreach my $line (@rawsnaps) {
|
||||
# only import snap creations from the specified filesystem
|
||||
if ($line =~ /$fs\@.*creation/) {
|
||||
if ($line =~ /\Q$fs\E\@.*creation/) {
|
||||
chomp $line;
|
||||
my $creation = $line;
|
||||
$creation =~ s/^.*\screation\s*(\d*).*/$1/;
|
||||
my $snap = $line;
|
||||
$snap =~ s/^\S*\@(\S*)\s*creation.*$/$1/;
|
||||
$snap =~ s/^.*\@(\S*)\s*creation.*$/$1/;
|
||||
$snaps{$type}{$snap}{'creation'}=$creation;
|
||||
}
|
||||
}
|
||||
|
|
@ -932,21 +994,30 @@ sub getsnaps() {
|
|||
sub getsendsize {
|
||||
my ($sourcehost,$snap1,$snap2,$isroot) = @_;
|
||||
|
||||
my $snap1escaped = escapeshellparam($snap1);
|
||||
my $snap2escaped = escapeshellparam($snap2);
|
||||
|
||||
my $mysudocmd;
|
||||
if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; }
|
||||
|
||||
my $sourcessh;
|
||||
if ($sourcehost ne '') {
|
||||
$sourcessh = "$sshcmd $sourcehost";
|
||||
$snap1escaped = escapeshellparam($snap1escaped);
|
||||
$snap2escaped = escapeshellparam($snap2escaped);
|
||||
} else {
|
||||
$sourcessh = '';
|
||||
}
|
||||
|
||||
my $snaps;
|
||||
if ($snap2) {
|
||||
# if we got a $snap2 argument, we want an incremental send estimate from $snap1 to $snap2.
|
||||
$snaps = "$args{'streamarg'} $snap1 $snap2";
|
||||
$snaps = "$args{'streamarg'} $snap1escaped $snap2escaped";
|
||||
} else {
|
||||
# if we didn't get a $snap2 arg, we want a full send estimate for $snap1.
|
||||
$snaps = "$snap1";
|
||||
$snaps = "$snap1escaped";
|
||||
}
|
||||
|
||||
my $sourcessh;
|
||||
if ($sourcehost ne '') { $sourcessh = "$sshcmd $sourcehost"; } else { $sourcessh = ''; }
|
||||
|
||||
my $getsendsizecmd = "$sourcessh $mysudocmd $zfscmd send -nP $snaps";
|
||||
if ($debug) { print "DEBUG: getting estimated transfer size from source $sourcehost using \"$getsendsizecmd 2>&1 |\"...\n"; }
|
||||
|
||||
|
|
@ -987,3 +1058,11 @@ sub getdate {
|
|||
$date{'stamp'} = "$date{'year'}-$date{'mon'}-$date{'mday'}:$date{'hour'}:$date{'min'}:$date{'sec'}";
|
||||
return %date;
|
||||
}
|
||||
|
||||
sub escapeshellparam {
|
||||
my ($par) = @_;
|
||||
# "escape" all single quotes
|
||||
$par =~ s/'/'"'"'/g;
|
||||
# single-quote entire string
|
||||
return "'$par'";
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue