cyteen
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
784 Commits 2 Branches 20 Tags 4.3 MiB
Commit Graph

784 Commits

Author SHA1 Message Date
Christoph Klaffl 01ace52642
Merge branch 'master' into syncoid-hold 2023-04-26 19:59:20 +02:00
Jim Salter f8ff5ab0c2
Merge pull request #809 from phreaker0/handle-same-second-bookmarks 
support bookmarks which are taken in the same second
 2023-04-26 13:49:37 -04:00
Christoph Klaffl 2143f629d5
Merge remote-tracking branch 'upstream/master' into handle-same-second-bookmarks 2023-04-26 19:40:24 +02:00
Jim Salter e6585e7ee5
Merge pull request #746 from mavhc/master 
Removed unneeded 2>/dev/null from mbufferoptions
 2023-04-26 13:00:03 -04:00
Jim Salter 6804826cf4
Merge pull request #808 from phreaker0/fix-tests 
fixes some tests which fail on fast storage
 2023-04-26 12:59:27 -04:00
Jim Salter ed1c542850
Merge pull request #523 from mat813/snapshot-removal 
Add target snapshot deletion.
 2023-04-26 12:58:29 -04:00
Mathieu Arnold 2f706a4ae1
Batch snapshot deletion. 
This is to prevent a problem with a large amount of snapshots which
exceed the allowed shell command length.
 2023-04-08 10:09:11 +02:00
Mathieu Arnold f711e6bf28
Add a note about when snapshot deletion is done. 2023-04-08 09:45:01 +02:00
Mathieu Arnold ecd1400539
Handle output/errors of those zfs destroy commands. 
If there was an obsolete remote syncoid_hostname_* snapshot that did not
get removed at the correct time, for some reason, like, maybe, network
problems, it would have been cleaned up in pruneoldsyncsnaps just before
this code, and we would get a strange error message saying:

    could not find any snapshots to destroy; check snapshot names.

Also, when using --quiet, do not output anything, as failing to remove
an obsolete snapshot is not really a big problem.
 2023-04-08 09:45:01 +02:00
Mathieu Arnold 63dd819ec5
Rename option. 2023-04-08 09:45:00 +02:00
Mathieu Arnold 2d89434ac3
Add target snapshot deletion. 2023-04-08 09:42:58 +02:00
Christoph Klaffl 91d96a4c87
support bookmarks which are taken in the same second 2023-03-24 09:00:07 +01:00
Christoph Klaffl a7f9f08f47
fixes some tests which fail on fast storage 2023-03-21 16:44:38 +01:00
Christoph Klaffl f3152d6f6c
Merge remote-tracking branch 'upstream/master' into syncoid-hold 2023-03-21 15:44:04 +01:00
Jim Salter 86fffca306
Merge pull request #807 from phreaker0/pr-merger 
PR Merger
 2023-03-21 02:04:45 -04:00
Christoph Klaffl e5b1d0fd4f
Merge branch 'pr796' into pr-merger 2023-03-20 22:31:40 +01:00
Christoph Klaffl b3d32d9394
Merge branch 'pr788' into pr-merger 2023-03-20 22:31:19 +01:00
Christoph Klaffl 50ff9b7d31
Merge branch 'pr775' into pr-merger 2023-03-20 22:29:17 +01:00
Christoph Klaffl fda6b52403
Merge branch 'pr765' into pr-merger 2023-03-20 22:28:15 +01:00
Christoph Klaffl 3b0f28184a
Merge branch 'pr701' into pr-merger 2023-03-20 22:13:34 +01:00
Christoph Klaffl e6f40483eb
Merge branch 'pr690' into pr-merger 2023-03-20 22:07:09 +01:00
Christoph Klaffl 52c30bfad7
Merge branch 'pr679' into pr-merger 2023-03-20 22:06:21 +01:00
Christoph Klaffl d5dba5e3ed
Merge branch 'pr670' into pr-merger 2023-03-20 22:01:43 +01:00
Christoph Klaffl dc0f13268b
Merge branch 'pr657' into pr-merger 2023-03-20 21:55:44 +01:00
Christoph Klaffl d55b29ef04
Merge branch 'pr643' into pr-merger 2023-03-20 21:52:24 +01:00
Christoph Klaffl de013fe13f
Merge branch 'pr638' into pr-merger 2023-03-20 21:50:46 +01:00
Christoph Klaffl 561220a5f9
Merge branch 'pr637' into pr-merger 2023-03-20 21:50:26 +01:00
Christoph Klaffl f942341f8d
Merge branch 'pr636' into pr-merger 2023-03-20 21:49:00 +01:00
Christoph Klaffl f2982d9313
Merge branch 'pr592' into pr-merger 2023-03-20 21:33:20 +01:00
Christoph Klaffl 42ed026837
Merge branch 'pr538' into pr-merger 2023-03-20 21:20:26 +01:00
Christoph Klaffl 9e87e8c95a
Merge branch 'pr769' into pr-merger 2023-03-20 21:14:43 +01:00
Christoph Klaffl 487fba24e5
Merge branch 'pr768' into pr-merger 2023-03-20 21:14:34 +01:00
Christoph Klaffl b488611ae7
Merge branch 'pr767' into pr-merger 2023-03-20 21:14:29 +01:00
Christoph Klaffl c2f5367d3d
Merge branch 'pr766' into pr-merger 2023-03-20 21:14:25 +01:00
Christoph Klaffl 9625a79e25
Merge branch 'pr608' into pr-merger 2023-03-20 21:14:13 +01:00
Christoph Klaffl 6deae74b7d
Merge branch 'pr606' into pr-merger 2023-03-20 21:14:07 +01:00
Christoph Klaffl 59544de134
Merge branch 'pr605' into pr-merger 2023-03-20 21:14:02 +01:00
Christoph Klaffl ea59c0f598
Merge branch 'pr506' into pr-merger 2023-03-20 21:13:52 +01:00
dodexahedron 38f2d625a8
Clarified that compression is on the wire 2023-02-02 19:32:08 -07: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
Josh Soref 2333f1142d spelling: suppress 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref 0fcaab54f6 spelling: snapshotted 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref 3ffa57c72f spelling: resumable 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref 7a8b0adb6d spelling: overridden 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref 93f2b8863e spelling: necessary 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref 9421892402 spelling: naming 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref a666424742 spelling: mbytes 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref c43048598a spelling: github 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref 12e962a133 spelling: errors 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:43:35 -05:00
Josh Soref c37f412797 spelling: errlevel 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-01-01 14:35:55 -05:00