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

559 Commits

Author SHA1 Message Date
Christoph Klaffl 22fe41cb11
redirect zfs receive error to stdout and only capture stdout for parsing of error codes, this way stderr is left alone and pv can work interactively 2019-06-06 08:04:00 +02:00
Jim Salter 681820ceab
Merge pull request #370 from g-a-c/patch-1 
Update INSTALL.md
 2019-05-22 10:33:09 -04:00
Jim Salter 1ca9a6d0c0
Merge pull request #368 from danielewood/patch-1 
Added line to enable sanoid-prune.service
 2019-05-22 10:32:45 -04:00
Jim Salter 39af643817
Merge pull request #375 from johnramsden/master 
Declare that sanoid service 'Wants' sanoid-prune
 2019-05-22 10:32:28 -04:00
Jim Salter 2fceef65a3
Merge branch 'master' into patch-1 2019-05-22 10:32:12 -04:00
Jim Salter 0168ee3a3c
Merge pull request #362 from shodanshok/master 
Changed (and simplified) DST handling
 2019-05-22 10:27:33 -04:00
Jim Salter 34ef1bbeeb
Merge pull request #385 from phreaker0/updates 
more error handling of zfs failures
 2019-05-22 10:26:21 -04:00
Christoph Klaffl 83c5e2c29b
added new dependency to all packages and install instructions 2019-05-20 18:31:38 +02: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 6eb1be3ef7
handle resume states where the source snapshot was already deleted 2019-05-20 18:18:21 +02:00
Christoph Klaffl 16fceba54c
moved common used variables to top of function 2019-05-20 18:01:29 +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
Jim Salter 837711a741
Merge pull request #309 from phreaker0/reset-resume-state 
WIP: reset resume state
 2019-05-17 12:00:57 -04:00
Christoph Klaffl 1046f7f58e
use capture::tiny for teeing commands 2019-05-16 18:42:26 +02:00
Christoph Klaffl f7bd267a6b
Merge branch 'master' into reset-resume-state 2019-05-16 18:15:02 +02:00
Gavin Chappell eef598c729 Update rules 
On my Debian Stretch system `dpkg-buildpackage` returns errors about not being able to find `sanoid.timer`
 2019-05-15 20:43:32 +01:00
Gavin Chappell 67ff4fed77 Update INSTALL.md 
`debhelper` is also a pre-requisite for Debian systems
 2019-05-15 20:43:32 +01:00
Jim Salter e320462c69
Merge pull request #382 from phreaker0/fix-snapshot-ordering 
fixed ordering of snapshots with the same creation timestamp
 2019-05-15 12:41:32 -04:00
Christoph Klaffl 522bdecd53
fixed ordering of snapshots with the same creation timestamp 2019-05-15 16:47:51 +02:00
John Ramsden ce93d89ec8
Declare that sanoid service 'Wants' sanoid-prune 
Also add --verbose flag for logging as mentioned in readme.

sanoid-prune.service never runs. Declare a 'Wants' dependency,
and 'Before' condition in the sanoid unit, and prune is run
after 'sanoid.service'.
 2019-04-20 15:34:49 -07:00
Jim Salter dd47dd5368
version number update, oops 2019-04-20 16:48:49 -04:00
Jim Salter 483ba0c3ee
version number update, oops 2019-04-20 16:48:21 -04:00
Jim Salter ea90108eab
revert -r in zfs get (not needed here) 2019-04-09 10:50:29 -04:00
Jim Salter 8d8df7e533
Add -r to zfs get -t snap for zfs 8.1 2019-04-07 19:51:32 -04:00
Jim Salter 607aad0a91
Add -r to zfs get -Hpt snap for zfs 8.1 2019-04-07 19:48:25 -04:00
Daniel Wood faf268b3b2
Added line to enable sanoid-prune.service 
@phreaker0,
I found that on my systems, sanoid-pune.service did nothing until I enabled it, then it was called by sanoid.service.
 2019-04-01 21:50:29 -07:00
shodanshok bfffd97910
Merge branch 'master' into master 2019-04-01 10:09:13 +02:00
Jim Salter 4609845de9
Merge pull request #270 from phreaker0/path 
don't use hardcoded paths
 2019-03-31 14:53:14 -04:00
Christoph Klaffl a78faed88c
Merge branch 'master' into path 2019-03-31 20:52:10 +02:00
Jim Salter be1a1f5bdd
Merge pull request #341 from phreaker0/fix-bookmark-edge-cases 
fix bookmark edge case where replication was already done to the late…
 2019-03-31 14:35:32 -04:00
Jim Salter 8d0efe288a
Merge pull request #367 from phreaker0/revert 
Revert #365
 2019-03-31 14:35:14 -04:00
Christoph Klaffl 111d93a166
Merge branch 'master' into fix-bookmark-edge-cases 2019-03-31 15:39:56 +02:00
Christoph Klaffl 1900ecaf32
added verbose cmd line flags for journald logging 2019-03-31 15:25:30 +02:00
Christoph Klaffl 90b8c92ec6
sanoid-prune.service is indeed referenced and run after the sanoid.service 
Revert "Fix systemd service definitions."

This reverts commit 17e15c2f54.
 2019-03-31 15:21:19 +02:00
Jim Salter afb33e0d68
Merge pull request #365 from danielewood/patch-1 
Fix systemd service definitions.
 2019-03-29 12:44:29 -04:00
Daniel Wood 17e15c2f54
Fix systemd service definitions. 
`sanoid-prune.service` is not referenced by a timer, so I have removed it.

I also modified the behavior of sanoid.service so it will take and prune snapshots according to the config file:
 - `--cron` switch is required for it to take action as a service
 - `--verbose` is there so that useful logs appear under `journalctl -t sanoid` (I personally run `--debug`)
 2019-03-29 09:37:28 -07:00
Jim Salter c162e636c4
Merge pull request #320 from phreaker0/zfs-recursion 
zfs recursion
 2019-03-29 12:02:51 -04:00
Jim Salter e376eadc97
Merge pull request #342 from phreaker0/create-bookmark 
implemented creation of zfs bookmarks
 2019-03-29 12:00:33 -04:00
Jim Salter 12198180d8
Merge pull request #352 from phreaker0/clone-fallback 
use ordinary replication if clone recreation fails
 2019-03-29 12:00:00 -04:00
Jim Salter 11b3af65fd
Merge pull request #334 from phreaker0/check-pool-resume 
check pool capability for resumeable replication instead of checking …
 2019-03-29 11:59:22 -04:00
Jim Salter fd2823926d
Merge pull request #319 from phreaker0/silence-excludes 
removed debug output from excludes loop
 2019-03-29 11:58:50 -04:00
Jim Salter 31e46da29b
Merge pull request #343 from phreaker0/whitelist-send-recv-options 
implemented parsing of provided zfs send/recv options and whitelisting for each use case as needed
 2019-03-29 11:57:13 -04:00
Jim Salter 68cc59a41c
Update INSTALL.md 2019-03-29 11:53:56 -04:00
Jim Salter 4783470f3c
Merge pull request #206 from RulerOf/master 
Add comprehensive installation instructions
 2019-03-29 11:52:02 -04:00
Jim Salter 189f9335a5
Merge pull request #335 from phreaker0/catch-some-errors 
Catch some errors
 2019-03-29 11:50:50 -04:00
Jim Salter 38ca1ef40b
Merge pull request #340 from phreaker0/fix-listing 
only list filesystems and volumes
 2019-03-29 11:50:14 -04:00
Jim Salter 5e0617f02e
Merge pull request #348 from phreaker0/fix-unitialized-variable 
fix unitialized variable
 2019-03-29 11:49:28 -04:00
Jim Salter 7900e9f8f9
Merge pull request #353 from phreaker0/check-ssh 
check if ssh connection works
 2019-03-29 11:49:03 -04:00
Jim Salter e86ac01259
Merge pull request #360 from phreaker0/fix-initial-no-stream 
initial replication without intermediate snapshots should use the cre…
 2019-03-29 11:48:32 -04:00
Jim Salter f163df2486
Merge pull request #356 from klemens-u/patch-1 
Added bwlimit units
 2019-03-29 11:47:35 -04:00