diff options
| author | LOLi <[email protected]> | 2018-02-12 21:28:59 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-02-12 12:28:59 -0800 |
| commit | c03f04708caecf9a4a4ce2134aaa6a8cabe499c9 (patch) | |
| tree | 581d4eba079667d0ed1b1b0c184d6bf1caffa633 /cmd | |
| parent | a893627fac8d4ed37cf00e671322dfdaa02d4f1c (diff) | |
'zfs receive' fails with "dataset is busy"
Receiving an incremental stream after an interrupted "zfs receive -s"
fails with the message "dataset is busy": this is because we still have
the hidden clone ../%recv from the resumable receive.
Improve the error message suggesting the existence of a partially
complete resumable stream from "zfs receive -s" which can be either
aborted ("zfs receive -A") or resumed ("zfs send -t").
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #7129
Closes #7154
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/zfs/zfs_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index fce228a20..991dd4444 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -6123,7 +6123,7 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol, (void) fprintf(stderr, gettext("cannot %s '%s': " "Contains partially-completed state from " - "\"zfs receive -r\", which can be resumed with " + "\"zfs receive -s\", which can be resumed with " "\"zfs send -t\"\n"), cmdname, zfs_get_name(zhp)); return (1); |