Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing zetaback erroring out when receiving FS is modified #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing zetaback erroring out when receiving FS is modified #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
381e9d8
Fixing zetaback erroring out after something touched the receiving fi…
Jun 24, 2014
be9e16d
Fixing locking on dir not working in all cases
Jun 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions zetaback.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ sub zfs_do_backup($$$$$$;$) {
print STDERR "Receiving to zfs filesystem $storefs/$encodedname\n"
if($DEBUG);
zfs_create_intermediate_filesystems("$storefs/$encodedname");
open(LBACKUP, "|__ZFS__ recv $storefs/$encodedname");
open(LBACKUP, "|__ZFS__ recv -F $storefs/$encodedname");
}
# Do it. yeah.
eval {
Expand Down Expand Up @@ -1304,7 +1304,7 @@ sub zfs_restore_part($$$$;$) {
$command .= " -b $dep" if($dep);
}
else {
$command = "__ZFS__ recv $fs";
$command = "__ZFS__ recv -F $fs";
}
if ($file) {
print " => piping $file to $command\n" if($DEBUG);
Expand Down Expand Up @@ -1630,7 +1630,7 @@ sub plan_and_run($$) {
# We need to drop a __zb_base snap or a __zb_incr snap before we proceed
unless($NEUTERED || $backup_type eq 'no') {
# attempt to lock this action, if it fails, skip -- someone else is working it.
next unless(lock($host, dir_encode($diskname), 1));
next unless(lock($host, dir_encode($diskname) . ".lock", 1));
unlock($host, '.list');

if($backup_type eq 'full') {
Expand Down Expand Up @@ -1677,7 +1677,7 @@ sub plan_and_run($$) {
}
$took_action = 1;
}
unlock($host, dir_encode($diskname), 1);
unlock($host, dir_encode($diskname) . ".lock", 1);
}
$suppress{"$host:$diskname"} = 1;
last if($took_action);
Expand Down