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

Revert "Zfs Recursion"

This commit is contained in:
Jim Salter 2019-01-06 15:41:18 -05:00 committed by GitHub
parent 6882c91208
commit 50a2374021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sanoid
View File

@ -502,13 +502,7 @@ sub take_snapshots {
# update to most current possible datestamp # update to most current possible datestamp
%datestamp = get_date(); %datestamp = get_date();
# print "we should have had a $type snapshot of $path $maxage seconds ago; most recent is $newestage seconds old.\n"; # print "we should have had a $type snapshot of $path $maxage seconds ago; most recent is $newestage seconds old.\n";
push(@newsnaps, "$path\@autosnap_$datestamp{'sortable'}${dateSuffix}_$type");
# use zfs (atomic) recursion if specified in config
if ($config{$section}{'zfs_recursion'}) {
push(@newsnaps, "$path\@autosnap_$datestamp{'sortable'}${dateSuffix}_$type\@");
} else {
push(@newsnaps, "$path\@autosnap_$datestamp{'sortable'}${dateSuffix}_$type");
}
} }
} }
} }
@ -516,14 +510,8 @@ sub take_snapshots {
if ( (scalar(@newsnaps)) > 0) { if ( (scalar(@newsnaps)) > 0) {
foreach my $snap ( @newsnaps ) { foreach my $snap ( @newsnaps ) {
my @split = split '@', $snap, -1; my $dataset = (split '@', $snap)[0];
my $recursiveFlag = 0; my $snapname = (split '@', $snap)[1];
if (scalar(@split) == 3) {
$recursiveFlag = 1;
chop $snap;
}
my $dataset = $split[0];
my $snapname = $split[1];
my $presnapshotfailure = 0; my $presnapshotfailure = 0;
if ($config{$dataset}{'pre_snapshot_script'} and !$args{'readonly'}) { if ($config{$dataset}{'pre_snapshot_script'} and !$args{'readonly'}) {
$ENV{'SANOID_TARGET'} = $dataset; $ENV{'SANOID_TARGET'} = $dataset;
@ -542,13 +530,8 @@ sub take_snapshots {
} }
if ($args{'verbose'}) { print "taking snapshot $snap\n"; } if ($args{'verbose'}) { print "taking snapshot $snap\n"; }
if (!$args{'readonly'}) { if (!$args{'readonly'}) {
if ($recursiveFlag) { system($zfs, "snapshot", "$snap") == 0
system($zfs, "snapshot", "-r", "$snap") == 0 or warn "CRITICAL ERROR: $zfs snapshot $snap failed, $?";
or warn "CRITICAL ERROR: $zfs snapshot -r $snap failed, $?";
} else {
system($zfs, "snapshot", "$snap") == 0
or warn "CRITICAL ERROR: $zfs snapshot $snap failed, $?";
}
} }
if ($config{$dataset}{'post_snapshot_script'} and !$args{'readonly'}) { if ($config{$dataset}{'post_snapshot_script'} and !$args{'readonly'}) {
if (!$presnapshotfailure or $config{$dataset}{'force_post_snapshot_script'}) { if (!$presnapshotfailure or $config{$dataset}{'force_post_snapshot_script'}) {
@ -863,9 +846,7 @@ sub init {
my $recursive = $ini{$section}{'recursive'} && grep( /^$ini{$section}{'recursive'}$/, @istrue ); my $recursive = $ini{$section}{'recursive'} && grep( /^$ini{$section}{'recursive'}$/, @istrue );
my $skipChildren = $ini{$section}{'skip_children'} && grep( /^$ini{$section}{'skip_children'}$/, @istrue ); my $skipChildren = $ini{$section}{'skip_children'} && grep( /^$ini{$section}{'skip_children'}$/, @istrue );
my @datasets; my @datasets;
if ($ini{$section}{'recursive'} =~ /zfs/i) { if ($recursive || $skipChildren) {
$config{$section}{'zfs_recursion'} = 1;
} elsif ($recursive || $skipChildren) {
@datasets = getchilddatasets($config{$section}{'path'}); @datasets = getchilddatasets($config{$section}{'path'});
DATASETS: foreach my $dataset(@datasets) { DATASETS: foreach my $dataset(@datasets) {
chomp $dataset; chomp $dataset;