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

fix error handling for fallback (old behaviour) and codestyle

This commit is contained in:
Christoph Klaffl 2026-02-18 20:36:42 +01:00
parent 29f05ff5c4
commit 4415b36ba8
No known key found for this signature in database
GPG Key ID: 8FC1D76EED4970D2
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sanoid
View File

@ -892,7 +892,7 @@ sub getsnaps {
my ($config, $cacheTTL, $forcecacheupdate) = @_; my ($config, $cacheTTL, $forcecacheupdate) = @_;
my @rawsnaps; my @rawsnaps;
my $exit_code; my $exitcode;
my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($cache); my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($cache);
@ -906,18 +906,23 @@ sub getsnaps {
print "INFO: cache expired - updating from zfs list.\n"; print "INFO: cache expired - updating from zfs list.\n";
} }
if ($args{'debug'}) { if ($args{'debug'}) {
print "INFO: running: $zfs get -Hrpt snapshot creation ".get_active_datasets(@params)."\n"; print "INFO: running: $zfs get -Hrpt snapshot creation " . get_active_datasets(@params) . "\n";
} }
} }
# just get snapshots from configured datasets to not spin up the disks # just get snapshots from configured datasets
open FH, "$zfs get -Hrpt snapshot creation ".get_active_datasets(@params)." |"; open FH, "$zfs get -Hrpt snapshot creation " . get_active_datasets(@params) . " |";
my $exit_code = $? >> 8;
if ($exit_code != 0) {
print "INFO: zfs list shapshots with dataset names does not work.. retrying without dataset names (this will spin-up all disks)\n";
open FH, "$zfs get -Hrpt snapshot creation |";
}
@rawsnaps = <FH>; @rawsnaps = <FH>;
close FH; close FH;
my $exitcode = $? >> 8;
if ($exitcode != 0) {
print "INFO: zfs list shapshots with dataset names does not work, retrying without dataset names\n";
open FH, "$zfs get -Hrpt snapshot creation |";
@rawsnaps = <FH>;
close FH;
}
open FH, "> $cache.tmp" or die "Could not write to $cache.tmp!\n"; open FH, "> $cache.tmp" or die "Could not write to $cache.tmp!\n";
print FH @rawsnaps; print FH @rawsnaps;
close FH; close FH;