From becec663207b792f15e5f47a16438899664dd560 Mon Sep 17 00:00:00 2001 From: Christoph Klaffl Date: Mon, 9 Jun 2025 23:21:44 +0200 Subject: [PATCH] prepare v2.3.0 --- CHANGELIST | 20 ++++++++++++++++++++ VERSION | 2 +- findoid | 2 +- packages/debian/changelog | 24 ++++++++++++++++++++++++ packages/rhel/sanoid.spec | 4 +++- sanoid | 2 +- syncoid | 2 +- tests/1_one_year/run.sh | 2 +- tests/2_dst_handling/run.sh | 2 +- tests/common/lib.sh | 10 +++++++++- 10 files changed, 62 insertions(+), 8 deletions(-) diff --git a/CHANGELIST b/CHANGELIST index 314e431..de00f66 100644 --- a/CHANGELIST +++ b/CHANGELIST @@ -1,3 +1,23 @@ +2.3.0 [overall] documentation updates, small fixes (@thecatontheflat, @mjeanson, @jiawen, @EchterAgo, @jan-krieg, @dlangille, @rightaditya, @MynaITLabs, @ossimoi, @alexgarel, @TopherIsSwell, @jimsalterjrs, @phreaker0) + [sanoid] implemented adding of taken snapshots to the cache file and a new parameter for setting an custom cache expire time (@phreaker0) + [sanoid] ignore duplicate template keys (@phreaker0) + [packaging] fix debian packaging with debian 12 and ubuntu 24.04 (@phreaker0) + [syncoid] fix typo preventing resumed transfer with --sendoptions (@Deltik) + [sanoid] remove iszfsbusy check to boost performance (@sdettmer) + [sanoid] write cache files in an atomic way to prevent race conditions (@phreaker0) + [sanoid] improve performance (especially for monitor commands) by caching the dataset list (@phreaker0) + [syncoid] add zstdmt compress options (@0xFelix) + [syncoid] added missing status information about what is done and provide more details (@phreaker0) + [syncoid] rename ssh control socket to avoid problem with length limits and conflicts (@phreaker0) + [syncoid] support relative paths (@phreaker0) + [syncoid] regather snapshots on --delete-target-snapshots flag (@Adam Fulton) + [sanoid] allow monitor commands to be run without root by using only the cache file (@Pajkastare) + [syncoid] add --include-snaps and --exclude-snaps options (@mr-vinn, @phreaker0) + [syncoid] escape property key and value pair in case of property preservation (@phreaker0) + [syncoid] prevent destroying of root dataset which leads to infinite loop because it can't be destroyed (@phreaker0) + [syncoid] modify zfs-get argument order for portability (@Rantherhin) + [sanoid] trim config values (@phreaker0) + 2.2.0 [overall] documentation updates, small fixes (@azmodude, @deviantintegral, @jimsalterjrs, @alexhaydock, @cbreak-black, @kd8bny, @JavaScriptDude, @veeableful, @rsheasby, @Topslakr, @mavhc, @adam-stamand, @joelishness, @jsoref, @dodexahedron, @phreaker0) [syncoid] implemented flag for preserving properties without the zfs -p flag (@phreaker0) [syncoid] implemented target snapshot deletion (@mat813) diff --git a/VERSION b/VERSION index ccbccc3..276cbf9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.0 +2.3.0 diff --git a/findoid b/findoid index 2561246..adda5cc 100755 --- a/findoid +++ b/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.2.0'; +$::VERSION = '2.3.0'; use strict; use warnings; diff --git a/packages/debian/changelog b/packages/debian/changelog index 00c0c07..ba369a1 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -1,3 +1,27 @@ +sanoid (2.3.0) unstable; urgency=medium + + [overall] documentation updates, small fixes (@thecatontheflat, @mjeanson, @jiawen, @EchterAgo, @jan-krieg, @dlangille, @rightaditya, @MynaITLabs, @ossimoi, @alexgarel, @TopherIsSwell, @jimsalterjrs, @phreaker0) + [sanoid] implemented adding of taken snapshots to the cache file and a new parameter for setting an custom cache expire time (@phreaker0) + [sanoid] ignore duplicate template keys (@phreaker0) + [packaging] fix debian packaging with debian 12 and ubuntu 24.04 (@phreaker0) + [syncoid] fix typo preventing resumed transfer with --sendoptions (@Deltik) + [sanoid] remove iszfsbusy check to boost performance (@sdettmer) + [sanoid] write cache files in an atomic way to prevent race conditions (@phreaker0) + [sanoid] improve performance (especially for monitor commands) by caching the dataset list (@phreaker0) + [syncoid] add zstdmt compress options (@0xFelix) + [syncoid] added missing status information about what is done and provide more details (@phreaker0) + [syncoid] rename ssh control socket to avoid problem with length limits and conflicts (@phreaker0) + [syncoid] support relative paths (@phreaker0) + [syncoid] regather snapshots on --delete-target-snapshots flag (@Adam Fulton) + [sanoid] allow monitor commands to be run without root by using only the cache file (@Pajkastare) + [syncoid] add --include-snaps and --exclude-snaps options (@mr-vinn, @phreaker0) + [syncoid] escape property key and value pair in case of property preservation (@phreaker0) + [syncoid] prevent destroying of root dataset which leads to infinite loop because it can't be destroyed (@phreaker0) + [syncoid] modify zfs-get argument order for portability (@Rantherhin) + [sanoid] trim config values (@phreaker0) + + -- Jim Salter Tue, 05 Jun 2025 22:47:00 +0200 + sanoid (2.2.0) unstable; urgency=medium [overall] documentation updates, small fixes (@azmodude, @deviantintegral, @jimsalterjrs, @alexhaydock, @cbreak-black, @kd8bny, @JavaScriptDude, @veeableful, @rsheasby, @Topslakr, @mavhc, @adam-stamand, @joelishness, @jsoref, @dodexahedron, @phreaker0) diff --git a/packages/rhel/sanoid.spec b/packages/rhel/sanoid.spec index 218f52d..ce48247 100644 --- a/packages/rhel/sanoid.spec +++ b/packages/rhel/sanoid.spec @@ -1,4 +1,4 @@ -%global version 2.2.0 +%global version 2.3.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 +* Tue Jun 05 2025 Christoph Klaffl - 2.3.0 +- Bump to 2.3.0 * Tue Jul 18 2023 Christoph Klaffl - 2.2.0 - Bump to 2.2.0 * Tue Nov 24 2020 Christoph Klaffl - 2.1.0 diff --git a/sanoid b/sanoid index c33451c..4a71319 100755 --- a/sanoid +++ b/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.2.0'; +$::VERSION = '2.3.0'; my $MINIMUM_DEFAULTS_VERSION = 2; use strict; diff --git a/syncoid b/syncoid index b7a1c13..956f3e7 100755 --- a/syncoid +++ b/syncoid @@ -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.2.0'; +$::VERSION = '2.3.0'; use strict; use warnings; diff --git a/tests/1_one_year/run.sh b/tests/1_one_year/run.sh index fe76946..48b3c7b 100755 --- a/tests/1_one_year/run.sh +++ b/tests/1_one_year/run.sh @@ -39,7 +39,7 @@ function cleanUp { trap cleanUp EXIT while [ $timestamp -le $END ]; do - setdate $timestamp; date; "${SANOID}" --cron --verbose + setdate $timestamp; date; "${SANOID}" --cron --verbose --cache-ttl=2592000 timestamp=$((timestamp+3600)) done diff --git a/tests/2_dst_handling/run.sh b/tests/2_dst_handling/run.sh index 3231631..2c3fd3e 100755 --- a/tests/2_dst_handling/run.sh +++ b/tests/2_dst_handling/run.sh @@ -42,7 +42,7 @@ function cleanUp { trap cleanUp EXIT while [ $timestamp -le $END ]; do - setdate $timestamp; date; "${SANOID}" --cron --verbose + setdate $timestamp; date; "${SANOID}" --cron --verbose --cache-ttl=2592000 timestamp=$((timestamp+900)) done diff --git a/tests/common/lib.sh b/tests/common/lib.sh index 9c88eff..84b2c63 100644 --- a/tests/common/lib.sh +++ b/tests/common/lib.sh @@ -10,7 +10,10 @@ function setup { export SANOID="../../sanoid" # make sure that there is no cache file - rm -f /var/cache/sanoidsnapshots.txt + rm -f /var/cache/sanoid/snapshots.txt + rm -f /var/cache/sanoid/datasets.txt + + mkdir -p /etc/sanoid # install needed sanoid configuration files [ -f sanoid.conf ] && cp sanoid.conf /etc/sanoid/sanoid.conf @@ -51,6 +54,11 @@ function disableTimeSync { if [ $? -eq 0 ]; then timedatectl set-ntp 0 fi + + which systemctl > /dev/null + if [ $? -eq 0 ]; then + systemctl is-active virtualbox-guest-utils.service && systemctl stop virtualbox-guest-utils.service + fi } function saveSnapshotList {