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

Merge branch 'master' into frequently

This commit is contained in:
Christoph Klaffl 2018-04-25 23:53:34 +02:00
parent ac16b2128e 979cb8bc3d
commit 503471718f
No known key found for this signature in database
GPG Key ID: FC1C525C2A47CC28
5 changed files with 438 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELIST
View File

@ -1,3 +1,6 @@
1.4.18 implemented special character handling and support of ZFS resume/receive tokens by default in syncoid,
thank you @phreaker0!
1.4.17 changed die to warn when unexpectedly unable to remove a snapshot - this 1.4.17 changed die to warn when unexpectedly unable to remove a snapshot - this
allows sanoid to continue taking/removing other snapshots not affected by allows sanoid to continue taking/removing other snapshots not affected by
whatever lock prevented the first from being taken or removed whatever lock prevented the first from being taken or removed

7
README.md
View File

@ -109,6 +109,9 @@ syncoid root@remotehost:data/images/vm backup/images/vm
Which would pull-replicate the filesystem from the remote host to the local system over an SSH tunnel. Which would pull-replicate the filesystem from the remote host to the local system over an SSH tunnel.
Syncoid supports recursive replication (replication of a dataset and all its child datasets) and uses mbuffer buffering, lzop compression, and pv progress bars if the utilities are available on the systems used. Syncoid supports recursive replication (replication of a dataset and all its child datasets) and uses mbuffer buffering, lzop compression, and pv progress bars if the utilities are available on the systems used.
If ZFS supports resumeable send/receive streams on both the source and target those will be enabled as default.
As of 1.4.18, syncoid also automatically supports and enables resume of interrupted replication when both source and target support this feature.
##### Syncoid Command Line Options ##### Syncoid Command Line Options
@ -148,6 +151,10 @@ Syncoid supports recursive replication (replication of a dataset and all its chi
This argument tells syncoid to restrict itself to existing snapshots, instead of creating a semi-ephemeral syncoid snapshot at execution time. Especially useful in multi-target (A->B, A->C) replication schemes, where you might otherwise accumulate a large number of foreign syncoid snapshots. This argument tells syncoid to restrict itself to existing snapshots, instead of creating a semi-ephemeral syncoid snapshot at execution time. Especially useful in multi-target (A->B, A->C) replication schemes, where you might otherwise accumulate a large number of foreign syncoid snapshots.
+ --no-resume
This argument tells syncoid to not use resumeable zfs send/receive streams.
+ --dumpsnaps + --dumpsnaps
This prints a list of snapshots during the run. This prints a list of snapshots during the run.

2
VERSION
View File

@ -1 +1 @@
1.4.17 1.4.18

2
sanoid
View File

@ -4,7 +4,7 @@
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this # 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. # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
$::VERSION = '1.4.17'; $::VERSION = '1.4.18';
my $MINIMUM_DEFAULTS_VERSION = 2; my $MINIMUM_DEFAULTS_VERSION = 2;
use strict; use strict;

686
syncoid
View File

File diff suppressed because it is too large Load Diff