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.

Sign up for GitHub

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

Fix 'zfs recv' of non large_dnode send streams #7662

Merged
merged 1 commit into from
Jun 28, 2018
Merged

Fix 'zfs recv' of non large_dnode send streams #7662

merged 1 commit into from
Jun 28, 2018

Conversation

tcaputi
Copy link
Contributor

@tcaputi tcaputi commented Jun 27, 2018

Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Fixes: #7617

Signed-off-by: Tom Caputi tcaputi@datto.com

How Has This Been Tested?

Tested locally myself and by the reporter of the bug.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commit messages are properly formatted and contain Signed-off-by.
  • Change has been approved by a ZFS on Linux member.

Fix 'zfs recv' of non large_dnode send streams
f73c17c 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Fixes: openzfs#7617

Signed-off-by: Tom Caputi <tcaputi@datto.com>
@megari
Copy link
Contributor

megari commented Jun 27, 2018

Is this also relevant to the 0.7 branch?

@DeHackEd
Copy link
Contributor

No, it was broken by 047116a

@codecov
Copy link

codecov bot commented Jun 28, 2018 •
edited
Loading

Codecov Report

Merging #7662 into master will increase coverage by 0.04%.
The diff coverage is 88.88%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7662      +/-   ##
==========================================
+ Coverage   78.06%    78.1%   +0.04%     
==========================================
  Files         368      368              
  Lines      111627   111628       +1     
==========================================
+ Hits        87144    87190      +46     
+ Misses      24483    24438      -45
Flag Coverage Δ
#kernel 78.68% <100%> (+0.01%) ⬆️
#user 67.05% <0%> (+0.31%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3be1eb2...f73c17c. Read the comment docs.

behlendorf
behlendorf approved these changes Jun 28, 2018
View reviewed changes
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@behlendorf behlendorf merged commit da2feb4 into openzfs:master Jun 28, 2018
dweeezil pushed a commit to dweeezil/zfs that referenced this pull request Aug 27, 2018
@dweeezil
Fix 'zfs recv' of non large_dnode send streams
b07a7fc 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
dweeezil pushed a commit to dweeezil/zfs that referenced this pull request Aug 28, 2018
@dweeezil
Fix 'zfs recv' of non large_dnode send streams
d7e08d0 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
dweeezil pushed a commit to dweeezil/zfs that referenced this pull request Aug 28, 2018
@dweeezil
Fix 'zfs recv' of non large_dnode send streams
1ee7b83 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 28, 2018
@tonyhutter
Fix 'zfs recv' of non large_dnode send streams
677b388 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
dweeezil pushed a commit to dweeezil/zfs that referenced this pull request Aug 28, 2018
@dweeezil
Fix 'zfs recv' of non large_dnode send streams
2473cc9 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 28, 2018
@tonyhutter
Fix 'zfs recv' of non large_dnode send streams
97517b2 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 30, 2018
@tonyhutter
Fix 'zfs recv' of non large_dnode send streams
48dc6eb 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 30, 2018
@tonyhutter
Fix 'zfs recv' of non large_dnode send streams
b4c4c01 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 30, 2018
@tonyhutter
Fix 'zfs recv' of non large_dnode send streams
a3c9281 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662

Requires-spl: refs/pull/707/head
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 31, 2018
@tonyhutter
Fix 'zfs recv' of non large_dnode send streams
9396081 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 5, 2018
@tonyhutter
Fix 'zfs recv' of non large_dnode send streams
45f0437 
Currently, there is a bug where older send streams without the
DMU_BACKUP_FEATURE_LARGE_DNODE flag are not handled correctly.
The code in receive_object() fails to handle cases where
drro->drr_dn_slots is set to 0, which is always the case when the
sending code does not support this feature flag. This patch fixes
the issue by ensuring that that a value of 0 is treated as
DNODE_MIN_SLOTS.

Tested-by:  DHE <git@dehacked.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes openzfs#7617
Closes openzfs#7662
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Failure to mount: "unable to fetch ZFS version for filesystem" after receiving a snapshot
4 participants
@tcaputi @megari @DeHackEd @behlendorf