Commit Graph

46 Commits

Author SHA1 Message Date
Christoph Klaffl becec66320
prepare v2.3.0 2025-06-09 23:21:44 +02:00
Christoph Klaffl b794da6f14
Revert "Merge pull request #818 from Deltik/fix/815"
This reverts commit 7c225a1d7b, reversing
changes made to acdc0938c9.
2025-06-05 23:23:30 +02:00
Nick Liu fab4b4076c
fix(syncoid): `zfs send` arg allowlist when sendsource is receivetoken
The `runsynccmd` subroutine was not matching the `$sendsource` when a
receive resume token is passed in. All usages that pass in the receive
resume token do not begin with a space; instead, they start with `-t `.

Fixes: https://github.com/jimsalterjrs/sanoid/issues/918
2024-04-26 02:18:19 -05:00
Christoph Klaffl 4e86733c1a
missed debug statement 2024-04-05 15:22:13 +02:00
Christoph Klaffl 7c8a34eceb
* proper order of tests
* timing fixes for fast NVME pools
* skip invasive tests by default
2024-04-05 15:20:28 +02:00
Nick Liu a904ba02f3
enh(run-tests.sh): Sort tests with "general numeric sort"
The sort before tended to be alphabetical, which put test
`8_force_delete_snapshot` after `815_sync_out-of-order_snapshots`, but
`8` should come before `815`.

Before:

```
root@demo:~/sanoid/tests/syncoid# ./run-tests.sh
Running test 1_bookmark_replication_intermediate ... [PASS]
Running test 2_bookmark_replication_no_intermediate ... [PASS]
Running test 3_force_delete ... [PASS]
Running test 4_bookmark_replication_edge_case ... [PASS]
Running test 5_reset_resume_state ... mbuffer: error: outputThread: error writing to <stdout> at offset 0x90000: Broken pipe
mbuffer: warning: error during output to <stdout>: Broken pipe
[PASS]
Running test 6_reset_resume_state2 ... [PASS]
Running test 7_preserve_recordsize ... [PASS]
Running test 815_sync_out-of-order_snapshots ... [PASS]
Running test 8_force_delete_snapshot ... [PASS]
```

After:

```
root@demo:~/sanoid/tests/syncoid# ./run-tests.sh
Running test 1_bookmark_replication_intermediate ... [PASS]
Running test 2_bookmark_replication_no_intermediate ... [PASS]
Running test 3_force_delete ... [PASS]
Running test 4_bookmark_replication_edge_case ... [PASS]
Running test 5_reset_resume_state ... mbuffer: error: outputThread: error writing to <stdout> at offset 0xf0000: Broken pipe
mbuffer: warning: error during output to <stdout>: Broken pipe
[PASS]
Running test 6_reset_resume_state2 ... [PASS]
Running test 7_preserve_recordsize ... [PASS]
Running test 8_force_delete_snapshot ... [PASS]
Running test 815_sync_out-of-order_snapshots ... [PASS]
```
2023-04-28 01:00:03 -05:00
Nick Liu b37092f376
test(syncoid): Add test to verify out-of-order snapshot sync
See https://github.com/jimsalterjrs/sanoid/issues/815 for the original
test.
2023-04-25 17:35:45 -05:00
Christoph Klaffl 790ea544ff
Merge branch 'master' into zfs-get 2024-01-13 23:27:38 +01:00
Christoph Klaffl becddb854f
Merge branch 'master' into preserve-properties-handle-special-symbols 2024-01-13 21:34:45 +01:00
Christoph Klaffl e9eb05e840
Merge branch 'master' into filter-snaps 2024-01-13 19:40:28 +01:00
Christoph Klaffl 4369576ac4
escape property key and value pair in case of property preservation 2024-01-09 20:40:33 +01:00
Justin Wolf dbbaac8ac3 modify zfs-get argument order for portability 2023-12-10 21:16:42 -06:00
Christoph Klaffl f3d4d309b5
implemented flag for preserving properties without the zfs -p flag 2023-07-18 08:38:40 +02:00
Christoph Klaffl a7f9f08f47
fixes some tests which fail on fast storage 2023-03-21 16:44:38 +01:00
Christoph Klaffl 0b27059133
Merge remote-tracking branch 'upstream/master' into filter-snaps 2023-03-21 16:35:20 +01:00
Christoph Klaffl b3d32d9394
Merge branch 'pr788' into pr-merger 2023-03-20 22:31:19 +01:00
Josh Soref ae28c10982 spelling: want
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:43:35 -05:00
Vinnie Okada 8e867c6f14 Add new syncoid tests
Test the new --include-snaps and --exclude-snaps options for syncoid.
2022-12-24 12:55:15 -07:00
Christoph Klaffl 309c0866fa
implemented removal of conflicting snapshots with force-delete option 2020-12-07 22:40:28 +01:00
Christoph Klaffl 2da9ba2095
only preserve recordsize for datasets of type "filesystem" 2020-11-03 18:05:13 +01:00
Christoph Klaffl d0ef3ec2d5
Merge branch 'master' into preserve-recordsize 2020-01-16 21:23:07 +01:00
Jim Salter f745aa25a1
Merge pull request #406 from phreaker0/dst
revert to old dst handling and make it nice
2019-09-25 16:40:45 -04:00
Christoph Klaffl e2532cb307
copy paste error 2019-09-25 18:36:57 +02:00
Christoph Klaffl 107545ce00
added test for preserving recordsizes 2019-09-25 18:34:26 +02:00
Christoph Klaffl 9791094816
some FreeBSD related fixes 2019-06-14 15:45:44 +02:00
Christoph Klaffl 82230f248c
improved dst handling to only suffix the duplicate hourly snapshot on DST change 2019-06-14 07:53:40 +02:00
Christoph Klaffl 0356af9d81
Revert "Changed (and simplified) DST handling (see here: https://github.com/jimsalterjrs/sanoid/issues/155)"
This reverts commit cf496dcf86.
2019-06-13 14:31:05 +02:00
Jim Salter 0168ee3a3c
Merge pull request #362 from shodanshok/master
Changed (and simplified) DST handling
2019-05-22 10:27:33 -04:00
Christoph Klaffl 0537de5bb6
test case for reseting the resume state if it's invalid 2019-05-20 18:19:03 +02:00
Christoph Klaffl 0ef2bd2556
added test to verify the last changes to handle partially received replication streams 2019-05-20 17:49:00 +02:00
shodanshok bfffd97910
Merge branch 'master' into master 2019-04-01 10:09:13 +02:00
Gionatan Danti cf496dcf86 Changed (and simplified) DST handling (see here: https://github.com/jimsalterjrs/sanoid/issues/155) 2019-03-26 14:48:32 +01:00
Christoph Klaffl 7141eab594
fix bookmark edge case where replication was already done to the latest snapshot (+ test) 2019-01-30 23:49:38 +01:00
Christoph Klaffl c3e20fdefc
FreeBSD sed needs a different syntax 2019-01-09 17:41:16 +01:00
Christoph Klaffl ea482ce7b6
make tests work on FreeBSD 2019-01-08 20:10:38 +01:00
Christoph Klaffl 0c217ced8b
Merge branch 'master' into force-delete 2018-12-04 22:15:54 +01:00
Jim Salter bb79e7b5ec
Merge pull request #247 from phreaker0/bookmarks
implemented support for zfs bookmarks as fallback
2018-12-04 15:49:00 -05:00
Christoph Klaffl e9a330f89a
adapt test as it works correctly know after the DST patch 2018-10-05 16:19:55 +02:00
Christoph Klaffl 8905c00335
added test for force-delete flag 2018-07-29 12:45:12 +02:00
Christoph Klaffl a1d9e79e70
added two tests for zfs bookmark replication 2018-07-27 22:58:42 +02:00
Jim Salter 50bd897cb7
Merge pull request #174 from phreaker0/tests
implemented a simple test which will take snapshots over a whole year…
2018-06-28 16:10:00 -04:00
Christoph Klaffl 371f8ff318
exit with error code upon failure 2017-12-06 23:41:15 +01:00
Christoph Klaffl ceb1397ef0
Revert "exit with error code upon failure"
This reverts commit 8d4484a2d1.
2017-12-06 23:40:23 +01:00
Christoph Klaffl 8d4484a2d1
exit with error code upon failure 2017-12-06 23:24:34 +01:00
Christoph Klaffl e61ccf1c9d
added test for checking for correct DST handling behaviour 2017-12-06 20:24:54 +01:00
Christoph Klaffl 31da53140f
implemented a simple test which will take snapshots over a whole year and
checks the resulting snapshot list
2017-12-06 19:00:44 +01:00