mirror of https://github.com/jimsalterjrs/sanoid
Merge branch 'jimsalterjrs:master' into syncoid-hold
This commit is contained in:
Juergen Heiles
GitHub
commit
8cf0144c02
28
CHANGELIST
28
CHANGELIST
|
|
@ -1,3 +1,29 @@
|
|||
2.1.0 [overall] documentation updates, small fixes (@HavardLine, @croadfeldt, @jimsalterjrs, @jim-perkins, @kr4z33, @phreaker0)
|
||||
[syncoid] do not require user to be specified for syncoid (@aerusso)
|
||||
[syncoid] implemented option for keeping sync snaps (@phreaker0)
|
||||
[syncoid] use sudo if neccessary for checking pool capabilities regarding resumeable send (@phreaker0)
|
||||
[syncoid] catch another case were the resume state isn't availabe anymore (@phreaker0)
|
||||
[syncoid] check for an invalid argument combination (@phreaker0)
|
||||
[syncoid] fix iszfsbusy check for similar dataset names (@phreaker0)
|
||||
[syncoid] append timezone offset to the syncoid snapshot name to fix DST collisions (@phreaker0)
|
||||
[packaging] post install script for debian package to remove old unused snapshot cache file (@phreaker0)
|
||||
[syncoid] implemented fallback for listing snapshots on solaris (@phreaker0)
|
||||
[sanoid] remove invalid locks (@phreaker0)
|
||||
[packaging] removed debian dependency for systemd (@phreaker0)
|
||||
[sanoid] move sanoid cache and lock files to subdirectories (@lopsided98)
|
||||
[sanoid] remove 's in monitoring messages (@dlangille)
|
||||
[findoid] reworked argument parsing and error out if file path is not provided (@phreaker0)
|
||||
[findoid] also show current file version if available (@phreaker0)
|
||||
[findoid] handle FileNotFound errors properly (@phreaker0)
|
||||
[findoid] don't use hardcoded paths (@phreaker0)
|
||||
[findoid] improve dataset detection by only including mounted datasets (@phreaker0)
|
||||
[sanoid] pass more information to pre/post/prune scripts and execute them only once per dataset (@tiedotguy, @phreaker0)
|
||||
[syncoid] implemented option for preserving recordsizes on initial replications (@phreaker0)
|
||||
[syncoid] fixed send size estimation for latest FreeBSD versions (@phreaker0)
|
||||
[syncoid] add ability to configure pv (@gdevenyi)
|
||||
[sanoid] don't use hardcoded paths (@phreaker0)
|
||||
[syncoid] gracefully handle error when source dataset disappeared (@mschout)
|
||||
|
||||
2.0.3 [sanoid] reverted DST handling and improved it as quickfix (@phreaker0)
|
||||
|
||||
2.0.2 [overall] documentation updates, new dependencies, small fixes, more warnings (@benyanke, @matveevandrey, @RulerOf, @klemens-u, @johnramsden, @danielewood, @g-a-c, @hartzell, @fryfrog, @phreaker0)
|
||||
|
|
@ -20,7 +46,7 @@
|
|||
[syncoid] option to change mbuffer size (@TerraTech)
|
||||
[tests] fixes for FreeBSD (@phreaker0)
|
||||
[sanoid] support for zfs recursion (@jMichaelA, @phreaker0)
|
||||
[syncoid] fixed bookmark handling for volumens (@ppcontrib)
|
||||
[syncoid] fixed bookmark handling for volumes (@ppcontrib)
|
||||
[sanoid] allow time units for monitoring warn/crit values (@phreaker0)
|
||||
|
||||
2.0.1 [sanoid] fixed broken monthly warn/critical monitoring values in default template (@jimsalterjrs)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
FreeBSD users will need to change the Perl shebangs at the top of the executables from #!/usr/bin/perl
|
||||
Syncoid assumes a bourne style shell on remote hosts. Using (t)csh (the default for root under FreeBSD)
|
||||
will cause syncoid to fail cryptically due to 2>&1 output redirects.
|
||||
|
||||
To use syncoid successfully with FreeBSD targets, you must use the chsh command to change the root shell:
|
||||
root@bsd:~# chsh -s /bin/sh
|
||||
|
||||
FreeBSD users will also need to change the Perl shebangs at the top of the executables from #!/usr/bin/perl
|
||||
to #!/usr/local/bin/perl in most cases.
|
||||
|
||||
Sorry folks, but if I set this with #!/usr/bin/env perl as suggested, then nothing works properly
|
||||
|
|
@ -11,14 +17,3 @@ If you don't want to have to change the shebangs, your other option is to drop a
|
|||
root@bsd:~# ln -s /usr/local/bin/perl /usr/bin/perl
|
||||
|
||||
After putting this symlink in place, ANY perl script shebanged for Linux will work on your system too.
|
||||
|
||||
Syncoid assumes a bourne style shell on remote hosts. Using (t)csh (the default for root under FreeBSD)
|
||||
has some known issues:
|
||||
|
||||
* If mbuffer is present, syncoid will fail with an "Ambiguous output redirect." error. So if you:
|
||||
root@bsd:~# ln -s /usr/local/bin/mbuffer /usr/bin/mbuffer
|
||||
make sure the remote user is using an sh compatible shell.
|
||||
|
||||
To change to a compatible shell, use the chsh command:
|
||||
|
||||
root@bsd:~# chsh -s /bin/sh
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ And its /etc/sanoid/sanoid.conf might look something like this:
|
|||
|
||||
Which would be enough to tell sanoid to take and keep 36 hourly snapshots, 30 dailies, 3 monthlies, and no yearlies for all datasets under data/images (but not data/images itself, since process_children_only is set). Except in the case of data/images/win7, which follows the same template (since it's a child of data/images) but only keeps 4 hourlies for whatever reason.
|
||||
|
||||
For more full details on sanoid.conf settings see [Wiki page](https://github.com/jimsalterjrs/sanoid/wiki/Sanoid#options).
|
||||
|
||||
**Note**: Be aware that if you don't specify some interval options the defaults will be used (from /etc/sanoid/sanoid.defaults.conf)
|
||||
|
||||
##### Sanoid Command Line Options
|
||||
|
|
|
|||
2
findoid
2
findoid
|
|
@ -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
|
||||
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
|
||||
|
||||
$::VERSION = '2.0.2';
|
||||
$::VERSION = '2.1.0';
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,33 @@
|
|||
sanoid (2.1.0) unstable; urgency=medium
|
||||
|
||||
[overall] documentation updates, small fixes (@HavardLine, @croadfeldt, @jimsalterjrs, @jim-perkins, @kr4z33, @phreaker0)
|
||||
[syncoid] do not require user to be specified for syncoid (@aerusso)
|
||||
[syncoid] implemented option for keeping sync snaps (@phreaker0)
|
||||
[syncoid] use sudo if neccessary for checking pool capabilities regarding resumeable send (@phreaker0)
|
||||
[syncoid] catch another case were the resume state isn't availabe anymore (@phreaker0)
|
||||
[syncoid] check for an invalid argument combination (@phreaker0)
|
||||
[syncoid] fix iszfsbusy check for similar dataset names (@phreaker0)
|
||||
[syncoid] append timezone offset to the syncoid snapshot name to fix DST collisions (@phreaker0)
|
||||
[packaging] post install script for debian package to remove old unused snapshot cache file (@phreaker0)
|
||||
[syncoid] implemented fallback for listing snapshots on solaris (@phreaker0)
|
||||
[sanoid] remove invalid locks (@phreaker0)
|
||||
[packaging] removed debian dependency for systemd (@phreaker0)
|
||||
[sanoid] move sanoid cache and lock files to subdirectories (@lopsided98)
|
||||
[sanoid] remove 's in monitoring messages (@dlangille)
|
||||
[findoid] reworked argument parsing and error out if file path is not provided (@phreaker0)
|
||||
[findoid] also show current file version if available (@phreaker0)
|
||||
[findoid] handle FileNotFound errors properly (@phreaker0)
|
||||
[findoid] don't use hardcoded paths (@phreaker0)
|
||||
[findoid] improve dataset detection by only including mounted datasets (@phreaker0)
|
||||
[sanoid] pass more information to pre/post/prune scripts and execute them only once per dataset (@tiedotguy, @phreaker0)
|
||||
[syncoid] implemented option for preserving recordsizes on initial replications (@phreaker0)
|
||||
[syncoid] fixed send size estimation for latest FreeBSD versions (@phreaker0)
|
||||
[syncoid] add ability to configure pv (@gdevenyi)
|
||||
[sanoid] don't use hardcoded paths (@phreaker0)
|
||||
[syncoid] gracefully handle error when source dataset disappeared (@mschout)
|
||||
|
||||
-- Jim Salter <github@jrs-s.net> Tue, 24 Nov 2020 11:47:00 +0100
|
||||
|
||||
sanoid (2.0.3) unstable; urgency=medium
|
||||
|
||||
[sanoid] reverted DST handling and improved it as quickfix (@phreaker0)
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
|||
%global version 2.0.3
|
||||
%global version 2.1.0
|
||||
%global git_tag v%{version}
|
||||
|
||||
# Enable with systemctl "enable sanoid.timer"
|
||||
|
|
@ -111,6 +111,8 @@ echo "* * * * * root %{_sbindir}/sanoid --cron" > %{buildroot}%{_docdir}/%{name}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Nov 24 2020 Christoph Klaffl <christoph@phreaker.eu> - 2.1.0
|
||||
- Bump to 2.1.0
|
||||
* Wed Oct 02 2019 Christoph Klaffl <christoph@phreaker.eu> - 2.0.3
|
||||
- Bump to 2.0.3
|
||||
* Wed Sep 25 2019 Christoph Klaffl <christoph@phreaker.eu> - 2.0.2
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
cf0ec23c310d2f9416ebabe48f5edb73 sanoid-1.4.18.tar.gz
|
||||
2
sanoid
2
sanoid
|
|
@ -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
|
||||
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
|
||||
|
||||
$::VERSION = '2.0.3';
|
||||
$::VERSION = '2.1.0';
|
||||
my $MINIMUM_DEFAULTS_VERSION = 2;
|
||||
|
||||
use strict;
|
||||
|
|
|
|||
Loading…
Reference in New Issue