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

729 Commits

Author SHA1 Message Date
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
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
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
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
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
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