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

Docs update + error handling 

updated in-program docs and readme,
check if matchingsnap exists before releasing hold
This commit is contained in:
rbike 2021-03-03 13:49:13 +01:00
parent 3bae6baf3d
commit 2858fbe907
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -272,7 +272,7 @@ As of 1.4.18, syncoid also automatically supports and enables resume of interrup
+ --identifier=
Adds the given identifier to the snapshot name after "syncoid_" prefix and before the hostname. This enables the use case of reliable replication to multiple targets from the same host. The following chars are allowed: a-z, A-Z, 0-9, _, -, : and . .
Adds the given identifier to the snapshot and hold name after "syncoid_" prefix and before the hostname. This enables the use case of reliable replication to multiple targets from the same host. The following chars are allowed: a-z, A-Z, 0-9, _, -, : and . .
+ -r --recursive
@ -314,6 +314,9 @@ As of 1.4.18, syncoid also automatically supports and enables resume of interrup
This argument tells syncoid to create a zfs bookmark for the newest snapshot after it got replicated successfully. The bookmark name will be equal to the snapshot name. Only works in combination with the --no-sync-snap option. This can be very useful for irregular replication where the last matching snapshot on the source was already deleted but the bookmark remains so a replication is still possible.
+ --use-hold
This argument tells syncoid to add a hold to the newest snapshot on the source and target after replication succeeds and to remove the hold after the next succesful replication. Setting a hold prevents the snapshots from being destroyed. The hold name incldues the identifier if set. This allows for separate holds in case of replication to multiple targets.
+ --preserve-recordsize
This argument tells syncoid to set the recordsize on the target before writing any data to it matching the one set on the replication src. This only applies to initial sends.

23
syncoid
View File

@ -4,8 +4,8 @@
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
#
# 2021-03-ß2: redbike
# support f0r zfs holds added
# 2021-03-03: redbike
# support for zfs holds added
$::VERSION = '2.0.3';
@ -845,21 +845,27 @@ sub syncdataset {
} else {
$holdcmd = "$sourcesudocmd $zfscmd hold $holdname $sourcefsescaped\@$newsyncsnapescaped";
$holdreleasecmd = "$sourcesudocmd $zfscmd release $holdname $sourcefsescaped\@$matchingsnapescaped";
};
}
if ($debug) { print "DEBUG: Set new hold on source: $holdcmd\n"; }
system($holdcmd) == 0 or warn "WARNING: $holdcmd failed: $?";
if ($debug) { print "DEBUG: Release old hold on source: $holdreleasecmd\n"; }
system($holdreleasecmd) == 0 or warn "WARNING: $holdreleasecmd failed: $?";
# Do hold release only if matchingsnap exists
if ($matchingsnap) {
if ($debug) { print "DEBUG: Release old hold on source: $holdreleasecmd\n"; }
system($holdreleasecmd) == 0 or warn "WARNING: $holdreleasecmd failed: $?";
}
if ($targethost ne '') {
$holdcmd = "$sshcmd $targethost " . escapeshellparam("$targetsudocmd $zfscmd hold $holdname $targetfsescaped\@$newsyncsnapescaped");
$holdreleasecmd = "$sshcmd $targethost " . escapeshellparam("$targetsudocmd $zfscmd release $holdname $targetfsescaped\@$matchingsnapescaped");
} else {
$holdcmd = "$targetsudocmd $zfscmd hold $holdname $targetfsescaped\@$newsyncsnapescaped"; $holdreleasecmd = "$targetsudocmd $zfscmd release $holdname $targetfsescaped\@$matchingsnapescaped";
};
}
if ($debug) { print "DEBUG: Set new hold on target: $holdcmd\n"; }
system($holdcmd) == 0 or warn "WARNING: $holdcmd failed: $?";
if ($debug) { print "DEBUG: Release old hold on target: $holdreleasecmd\n"; }
system($holdreleasecmd) == 0 or warn "WARNING: $holdreleasecmd failed: $?";
# Do hold release only if matchingsnap exists
if ($matchingsnap) {
if ($debug) { print "DEBUG: Release old hold on target: $holdreleasecmd\n"; }
system($holdreleasecmd) == 0 or warn "WARNING: $holdreleasecmd failed: $?";
}
}
if (defined $args{'no-sync-snap'}) {
if (defined $args{'create-bookmark'}) {
@ -2005,6 +2011,7 @@ Options:
--no-sync-snap Does not create new snapshot, only transfers existing
--keep-sync-snap Don't destroy created sync snapshots
--create-bookmark Creates a zfs bookmark for the newest snapshot on the source after replication succeeds (only works with --no-sync-snap)
--use-hold Adds a hold to the newest snapshot on the source and target after replication succeeds and removes the hold after the next succesful replication. The hold name incldues the identifier if set. This allows for separate holds in case of multiple targets
--preserve-recordsize Preserves the recordsize on initial sends to the target
--no-clone-rollback Does not rollback clones on target
--no-rollback Does not rollback clones or snapshots on target (it probably requires a readonly target)