Commit Graph

747 Commits

Author SHA1 Message Date
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
joelishness 5d469c4bb2
Update README.md
Fixed some typos
2022-10-03 21:36:26 -07:00
Christoph Klaffl 0808575874
syncoid should exit with an error if the specified src dataset doesn't exist (and only skip child datasets which vanished) 2022-09-13 17:13:01 +02:00
Christoph Klaffl a5d7896c0f
improve accuracy of zfs receive check 2022-09-13 00:16:49 +02:00
Christoph Klaffl 4f150ec6ec
fix snapshot listing fallback 2022-09-13 00:02:03 +02:00
Christoph Klaffl fa67fbe845
bring back no-rollback option 2022-09-12 23:44:52 +02:00
Daryl Bennett c408bddab4 Include syncoid remote user requirment
Add requirement for syncoid w/ remote hosts to be able to sudo without a password.
Recommends a least privilege configuration option for enabling `NOPASSWD`
2022-09-05 19:45:10 -07:00
Endre Szabo 21931bd8a6
Merge branch 'jimsalterjrs:master' into ssh_config 2022-04-25 09:05:58 +02: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
Topslakr 1fcf348001
Update Install.md for Centos 8
Updated the install language, and commands, to better server Centos 8 and it's derivatives. Instead of using CPAN, enabling the 'PowerTools' repo will make those modules available for installation and kept current with normal OS updates.

Updated command to enable _and_ start sanoid.timer, instead of using two commands.
2021-12-06 13:57:18 -05:00
Ryan David Sheasby 864ab7f95b
Update debian installation instructions
Previous instructions couldn't actually be copied and pasted. This will update the instructions to work correctly when copied as-is
2021-11-02 11:36:13 +02:00
Lilis Iskandar 523d500609
Update README.md
Signed-off-by: Lilis Iskandar <lilis@veand.co>
2021-09-29 18:19:26 +08: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
Daryl Bennett a9ece1c7bf
Include syncoid remote user requirment
Add requirement for syncoid w/ remote hosts to be able to sudo without a password.
Recommends a least privilege configuration option for enabling `NOPASSWD`
2021-08-23 20:22:35 -04:00
Gerhard Roethlin c125835e44 MacOS Install Information
Installation information for running sanoid on MacOS via launchd.
A launchd example plist file is provided in the same way equivalent
files are created on other platforms.
2021-07-23 17:39:28 +02:00
Alex Haydock e0862dff52
Improve documentation for RHEL-family distros 2021-05-02 15:08:28 +01:00
Jim Salter 9c0a0e7822
Update FREEBSD.readme 2021-04-17 12:50:16 -04:00
Andrew Berry c2f3f5b6b1
Fix missing t on target 2021-04-15 07:05:03 -04:00
Gordon Schulz 3954008697
Fix bogus dates in %changelog to satisfy rpmlint
- 11/24/2020 -> Tuesday
- 12/04/2018 -> Tuesday

Prior to changes:

```
$ rpmlint sanoid.spec
sanoid.spec: E: specfile-error warning: bogus date in %changelog: Wed Nov 24 2020 Christoph Klaffl <christoph@phreaker.eu> - 2.1.0
sanoid.spec: E: specfile-error warning: bogus date in %changelog: Wed Dec 04 2018 Christoph Klaffl <christoph@phreaker.eu> - 2.0.0
0 packages and 1 specfiles checked; 2 errors, 0 warnings.
```

After changes:

```
$ rpmlint sanoid.spec
0 packages and 1 specfiles checked; 0 errors, 0 warnings.
```
2021-04-10 12:59:31 +02:00
git@end.re c151703837 Implementing support for ssh_config(5) files 2021-04-08 15:01:45 +02: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 48eefd21e8
don't try to parse stats for spares which are in use as there are none 2020-12-14 20:57:34 +01:00
Christoph Klaffl 316b01e9c2
fix duplicate key definitions by only using the first occurence and printing a warning 2020-12-09 09:46:54 +01:00
Christoph Klaffl 309c0866fa
implemented removal of conflicting snapshots with force-delete option 2020-12-07 22:40:28 +01:00