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

Send/Receive Fixes #2729

Closed
wants to merge 2 commits into from
Closed

Send/Receive Fixes #2729

wants to merge 2 commits into from

Conversation

ryao
Copy link
Contributor

@ryao ryao commented Sep 22, 2014

This is a refresh of #2338 that supersedes it and addresses my comment with regard to porting the entire FreeBSD commit. It might resolve #2210 and #2602.

@ryao
Copy link
Contributor Author

ryao commented Sep 22, 2014

I have refreshed this pull request to conform to style requirements.

@ryao
Copy link
Contributor Author

ryao commented Sep 29, 2014

@behlendorf The failure appears to be a pre-existing issue in the build bot. This should be safe to merge.

smh and others added 2 commits September 29, 2014 16:26
…eplication being processed in a random order instead of creation order.

Eliminates needless filesystem renames caused by removed parent snapshots
which subsequently causes many more errors.

PR:		kern/172259
Submitted by:	Steven Hartland
Reviewed by:	pjd (mentor)
Approved by:	pjd (mentor)
MFC after:	2 weeks

Minor whitespace fixes were made to conform with style requirements:

lib/libzfs/libzfs_sendrecv.c: 2269: indent by spaces instead of tabs
lib/libzfs/libzfs_sendrecv.c: 2270: indent by spaces instead of tabs

References:
  freebsd/freebsd-src@4995789

Ported-by: Richard Yao <[email protected]>
... as opposed to sending properties of all snapshots of the relevant
filesystem.  The previous behavior results in properties being set on
all snapshots on the receiving side, which is quite slow.
More details are here:
  http://thread.gmane.org/gmane.comp.file-systems.openzfs.devel/346

Behavior of zfs send -R is not changed.
@ryao
Copy link
Contributor Author

ryao commented Sep 29, 2014

The failure was fixed in master by cb08f06. I have rebased the branch on master and force repushed. It will likely clear the buildbot this time.

@ryao
Copy link
Contributor Author

ryao commented Oct 2, 2014

@kpande That is good to hear.

@behlendorf Is there anything blocking inclusion?

@behlendorf behlendorf added this to the 0.6.4 milestone Oct 2, 2014
@behlendorf behlendorf added the Bug label Oct 2, 2014
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Oct 3, 2014
FreeBSD PR kern/172259: Fixes zfs receive errors caused by snapshot
replication being processed in a random order instead of creation
order.

Eliminates needless filesystem renames caused by removed parent
snapshots which subsequently causes many more errors.

PR:		kern/172259
Submitted by:	Steven Hartland
Reviewed by:	pjd (mentor)
Approved by:	pjd (mentor)
MFC after:	2 weeks

References:
  freebsd/freebsd-src@4995789

Porting notes:

Minor whitespace fixes were made to conform with style requirements:

lib/libzfs/libzfs_sendrecv.c: 2269: indent by spaces instead of tabs
lib/libzfs/libzfs_sendrecv.c: 2270: indent by spaces instead of tabs

Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue openzfs#2729
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Oct 3, 2014
... as opposed to sending properties of all snapshots of the relevant
filesystem.  The previous behavior results in properties being set on
all snapshots on the receiving side, which is quite slow.

Behavior of zfs send -R is not changed.

References:
  http://thread.gmane.org/gmane.comp.file-systems.openzfs.devel/346

Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue openzfs#2729
Issue openzfs#2210
@behlendorf
Copy link
Contributor

Merged as:

0574855 zfs send -p send properties only for snapshots that are actually sent
7509a3d FreeBSD PR kern/172259: Fixes zfs receive errors

@dweeezil
Copy link
Contributor

I've been meaning to point out that streams created with this patch are not necessarily compatible with zfs receive -F on older systems (without this patch).

EDIT: Removed the zstreamdump output. I tried making a reproducer today and failed. I'm going to continue to look into this and if I can find the actual issue, will post it as another issue.

@dweeezil
Copy link
Contributor

Sorry for the false alarm, this commit is not the cause of the problem I'm seeing. I'll be posting another issue or pull request shortly with details as to the actual issue.

ryao pushed a commit to ryao/zfs that referenced this pull request Nov 29, 2014
FreeBSD PR kern/172259: Fixes zfs receive errors caused by snapshot
replication being processed in a random order instead of creation
order.

Eliminates needless filesystem renames caused by removed parent
snapshots which subsequently causes many more errors.

PR:		kern/172259
Submitted by:	Steven Hartland
Reviewed by:	pjd (mentor)
Approved by:	pjd (mentor)
MFC after:	2 weeks

References:
  freebsd/freebsd-src@4995789

Porting notes:

Minor whitespace fixes were made to conform with style requirements:

lib/libzfs/libzfs_sendrecv.c: 2269: indent by spaces instead of tabs
lib/libzfs/libzfs_sendrecv.c: 2270: indent by spaces instead of tabs

Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue openzfs#2729
ryao pushed a commit to ryao/zfs that referenced this pull request Nov 29, 2014
... as opposed to sending properties of all snapshots of the relevant
filesystem.  The previous behavior results in properties being set on
all snapshots on the receiving side, which is quite slow.

Behavior of zfs send -R is not changed.

References:
  http://thread.gmane.org/gmane.comp.file-systems.openzfs.devel/346

Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue openzfs#2729
Issue openzfs#2210
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

zfs receive fails receiving a deduplicated stream "invalid backup stream"
4 participants