Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add zfs replication #65407

Merged
merged 3 commits into from Aug 3, 2019
Merged

Add zfs replication #65407

merged 3 commits into from Aug 3, 2019

Conversation

alunduil
Copy link
Contributor

Motivation for this change

I was looking for a simple no frills zfs replication of snapshots that matched the simplicity of services.zfs.autoSnapshot's configuration. This adds a straightforward single endpoint replication of snapshots using SSH and a small python utility, zfs-replicate.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@alunduil alunduil requested a review from FRidh as a code owner July 26, 2019 04:46
@alunduil
Copy link
Contributor Author

I'll get those changes fixed into this pull request tonight. Thanks for the review and let me know what else I can do to prep this well for landing.

@alunduil
Copy link
Contributor Author

I've done a little more tidying. Let me know if there is anything else I've overlooked. I'll resolve the merge conflict once the review starts looking like it's wrapping up.

@alunduil
Copy link
Contributor Author

alunduil commented Aug 2, 2019

@FRidh and @Mic92 how can I check the output of grahamcofborg or is it complaining about the merge conflicts?

@Mic92
Copy link
Member

Mic92 commented Aug 2, 2019

@alunduil yes. it is about merge conflicts. Just do a git pull --rebase locally followed by a force push.

@alunduil
pythonPackages.stringcase: init at version 1.2.0
2e7355f 
Needed by zfs-replicate.
@alunduil
zfs-replicate: init at 1.1.11
29bdb1c 
Used by zfs.autoReplication module.
@alunduil
nixos/zfs: add autoReplication functionality
bdd7b5a 
This adds a simple configuration for sending snapshots to a remote
system using zfs-replicate that ties into the autoSnapshot settings
already present in services.zfs.autoSnapshot.
@alunduil
Copy link
Contributor Author

alunduil commented Aug 3, 2019

@FRidh everything looks like it's passing at this point. Anything else I've overlooked or is this ready to land?

@Mic92 Mic92 merged commit d02ead4 into NixOS:master Aug 3, 2019
@alunduil alunduil mentioned this pull request Oct 28, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@FRidh FRidh FRidh requested changes

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: python 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@alunduil @Mic92 @FRidh