diff options
| author | mav <mav@FreeBSD.org> | 2015-11-13 09:30:17 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-11-13 09:30:17 +0000 |
| commit | 76f98aa10ac1d58655f47588910862da714725e1 (patch) | |
| tree | 256fee4ecc37c986528c3db137032619de79e32d /cddl/lib/libzfs | |
| parent | 49d28de1a8839687816d368b8ce18808d9643c72 (diff) | |
| download | FreeBSD-src-76f98aa10ac1d58655f47588910862da714725e1.zip FreeBSD-src-76f98aa10ac1d58655f47588910862da714725e1.tar.gz | |
MFC r289362, r289445: 2605 want to resume interrupted zfs send
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Xin Li <delphij@freebsd.org>
Reviewed by: Arne Jansen <sensille@gmx.net>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Matthew Ahrens <mahrens@delphix.com>
illumos/illumos-gate@9c3fd1216fa7fb02cfbc78a2518a686d54b48ab8
For more info, see:
- slides http://www.slideshare.net/MatthewAhrens/openzfs-send-and-receive
- video https://www.youtube.com/watch?v=iY44jPMvxog
- manpage changes (for zfs resume -s and zfs send -t)
- upcoming talk at the OpenZFS Developer Summit
The TL;DR is:
Use "zfs receive -s" to save the partially received state on failure.
On failure, get the receive token with "zfs get receive_resume_token <fs>"
Resume the send with "zfs send -t <token_value>"
Relnotes: yes
Diffstat (limited to 'cddl/lib/libzfs')
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 19a3f2e..b960c9e 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -8,10 +8,10 @@ LIB= zfs DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \ - ${LIBNVPAIR} + ${LIBNVPAIR} ${LIBZ} LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ - -lbsdxml -lgeom -lnvpair -lzfs_core + -lbsdxml -lgeom -lnvpair -lz -lzfs_core SRCS= deviceid.c \ fsshare.c \ |
