Commit graph

716 commits

Author SHA1 Message Date
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
Josh Soref
cad1215501 spelling: debugging
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:30:57 -05:00
Josh Soref
7d24d97045 spelling: available
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:30:57 -05:00
Josh Soref
9f898439e0 spelling: a lot
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:30:57 -05:00
Jim Salter
ef601eb96b Merge branch 'master' of https://github.com/jimsalterjrs/sanoid 2022-04-08 21:34:58 +00:00
Jim Salter
ee8c884460 put local resume token support back in 2022-04-08 21:34:01 +00:00
Jim Salter
b0a71f763a
Merge pull request #734 from Gryd3/patch-1
append a rand int to the socket name.
2022-04-08 17:18:23 -04:00
Jim Salter
ef2b4f887a no more rolling targets back, receive -F only 2022-04-08 21:09:51 +00:00
Jim Salter
ec7858c1c7 don't use resume tokens for purely local replication 2022-04-08 20:57:53 +00:00
Gryd3
b1c2684c63
append a rand int to the socket name.
Running more than one 'syncoid' at the same time to the same host resulted in two jobs referencing the same socket.
Often results in "already exists, disabling multiplexing" but has in more than one occasion failed with the following:

ControlSocket /tmp/syncoid-zfsbackup-zfsbackup@10.0.0.1-1649107066 already exists, disabling multiplexing
lzop: Inappropriate ioctl for device: <stdin>
CRITICAL ERROR: ssh     -S /tmp/syncoid-zfsbackup-zfsbackup@10.0.0.1-1649107066 zfsbackup@10.0.0.1 ' zfs send  -I '"'"'pool/office'"'"'@'"'"'autosnap_2022-04-04_21:00:00_frequently'"'"' '"'"'pool/office'"'"'@'"'"'autosnap_2022-04-04_21:15:00_frequently'"'"' | lzop  | mbuffer -R 5m -q -s 128k -m 16M 2>/dev/null' | mbuffer  -q -s 128k -m 16M 2>/dev/null | lzop -dfc | pv -s 18356312 |  zfs receive  -s -F 'zfs-pool/vault/office' 2>&1 failed: 256 at /usr/sbin/syncoid line 786.

Sample use-case: 
Using Monit, Cron, or some other scheduler to trigger more than syncoid to the same host to sync two datasets.
Stagger the sync so that no two jobs get started at the same time, or add some form of randomization to the socket name so that two jobs may start at the same time.
2022-04-04 15:00:31 -07:00
Jim Salter
d863c35cac
Merge pull request #676 from JavaScriptDude/patch-1
Add Link to Wiki Detailing sanoid.conf Settings
2021-09-23 12:42:24 -04:00
JavaScriptDude
265d4a009e
Add Link to Wiki Detailing sanoid.conf Settings 2021-09-22 18:17:15 -04:00
Jim Salter
9c0a0e7822
Update FREEBSD.readme 2021-04-17 12:50:16 -04:00
Jim Salter
9564454d74
Merge pull request #601 from phreaker0/prepare-2.1.0
prepare 2.1.0
2021-04-01 11:41:44 -04:00
Christoph Klaffl
3aac31a8a1
removed old rhel version 2020-11-24 11:52:45 +01:00
Christoph Klaffl
77d0135a60
prepare v2.1.0 release 2020-11-24 11:52:20 +01:00
Jim Salter
50cf9c9cc5
Merge pull request #437 from phreaker0/preserve-recordsize
preserve recordsize
2020-11-03 12:19:07 -05:00
Christoph Klaffl
2da9ba2095
only preserve recordsize for datasets of type "filesystem" 2020-11-03 18:05:13 +01:00
Christoph Klaffl
bdd0dfb733
Merge branch 'master' into preserve-recordsize 2020-11-03 17:50:50 +01:00
Jim Salter
a4cde57d29
Merge pull request #497 from phreaker0/scripts-snapshot-grouping
Scripts snapshot grouping
2020-11-01 17:47:11 -05:00
Jim Salter
59e8949efe
Merge pull request #498 from phreaker0/syncoid-dst-fix
append timezone offset to the syncoid snapshot name to fix DST collis…
2020-11-01 17:46:32 -05:00
Jim Salter
6041f0982b
Merge pull request #399 from phreaker0/path2
don't use hardcoded paths
2020-11-01 17:28:20 -05:00
Jim Salter
2de05798f4
Merge pull request #509 from phreaker0/docs-busybox
added note for busybox based distributions
2020-11-01 17:24:39 -05:00
Jim Salter
14e6c62d0a
Merge pull request #508 from phreaker0/check-arguments
check for an invalid argument combination
2020-11-01 17:24:29 -05:00
Jim Salter
42ea8dffce
Merge pull request #507 from phreaker0/fix-busy-detection
fix iszfsbusy check for similar dataset names
2020-11-01 17:24:20 -05:00
Jim Salter
25823b1006
Merge pull request #505 from phreaker0/docs-defaults-note
added note about the default options if some interval types aren't ...
2020-11-01 17:24:11 -05:00
Jim Salter
bb19048501
Merge pull request #504 from phreaker0/docs-capacity-overiding
added note about capacity limit overriding
2020-11-01 17:24:02 -05:00
Jim Salter
318f7993ef
Merge pull request #502 from phreaker0/docs-fix-argument
fix typo in argument description
2020-11-01 17:23:49 -05:00
Jim Salter
2acb3e3fea
Merge pull request #501 from phreaker0/docs-centos
extended install instructions for centos if perl dependencies can't b…
2020-11-01 17:23:33 -05:00
Jim Salter
006f897d74
Merge pull request #500 from phreaker0/docs-cron-example
added cron setup example
2020-11-01 17:23:06 -05:00
Jim Salter
345e7e58b5
Merge pull request #374 from aerusso/pulls/syncoid-dont-require-user
Do not require user to be specified for syncoid
2020-11-01 17:22:57 -05:00
Jim Salter
58263cc8aa
Merge pull request #503 from phreaker0/docs-atomic-option
document the atomic way to take snapshots recursively
2020-11-01 17:20:57 -05:00
Jim Salter
f187e072b8
Merge pull request #529 from phreaker0/root-resume-check
use sudo if neccessary for checking pool capabilities regarding resum…
2020-11-01 17:19:50 -05:00
Jim Salter
c21b72a376
Merge pull request #510 from phreaker0/reset-resume-2
catch another case in which the resume state isn't availabe anymore
2020-11-01 17:19:22 -05:00
Jim Salter
0ac10750a7
Merge pull request #536 from phreaker0/keep-sync-snap
implemented option for keeping sync snaps
2020-11-01 17:19:00 -05:00
Jim Salter
d526d9167d
Merge pull request #580 from kr4z33/patch-1
Update INSTALL.md
2020-11-01 17:18:36 -05:00
Jim Salter
e6fdc196f0
Merge pull request #576 from jim-perkins/patch-1
Update sanoid.conf
2020-11-01 17:18:15 -05:00
Antonio Russo
f397687968
Do not require user to be specified for syncoid
Extends syncoid remote capabilities to match that of ssh as closely as
possible: allow a remote dataset to be specified without a username.

 - Detect if a remote reference is possible by looking for a : before
   any / characters.
 - Check if there are any pool names that might conflict with this
   name. E.g., 'weird:symbol/ds' might refer to the pool "symbol" on
   host "weird", and dataset ds. OR it might refer to the local pool
   "weird:symbol" and dataset ds.
 - Prefer local pools, matching existing behavior. No preexisting
   functioning configurations will break.
 - The name of the control socket is changed slightly.
 - A bug in the handling of remote datasets with colons in the name
   is addressed.

Signed-off-by: Antonio Russo <aerusso@aerusso.net>
2020-11-01 10:55:50 -07:00
kr4z33
b31a7ba7d8
Update INSTALL.md
"build-essential" was required for me to complete the Debian/Ubuntu instructions.
2020-08-17 19:16:26 -10:00
Jim Perkins
2c3de61b2b
Update sanoid.conf
keeps system from running sanoid on non existent datasets
2020-08-03 02:58:06 -05:00
jimsalterjrs
9544ea7e6a typo in syncoid help 2020-05-23 16:27:29 -04:00
Christoph Klaffl
9ab57e9bb4
added documentation regarding --keep-sync-snap option 2020-05-01 17:26:54 +02:00