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

remove deduplicated send/receive code #10212

Merged
merged 3 commits into from
Apr 23, 2020

Conversation

ahrens
Copy link
Member

@ahrens ahrens commented Apr 15, 2020

Motivation and Context

Deduplicated send streams (i.e. zfs send -D and zfs receive of such
streams) are deprecated. Deduplicated send streams can be received by
first converting them to non-deduplicated with the zstream redup
command.

See #10117, #10156, and #7887

Description

This commit removes the code for sending and receiving deduplicated send
streams. zfs send -D will now print a warning, ignore the -D flag,
and generate a regular (non-deduplicated) send stream. zfs receive of
a deduplicated send stream will print an error message and fail.

The resulting code simplification (especially in the kernel's support
for receiving dedup streams) should help enable future performance
enhancements.

How Has This Been Tested?

Several new tests are added which leverage zstream redup.

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.
  • I have run the ZFS Test Suite with this change applied.
  • All commit messages are properly formatted and contain Signed-off-by.

Deduplicated send streams (i.e. `zfs send -D` and `zfs receive` of such
streams) are deprecated.  Deduplicated send streams can be received by
first converting them to non-deduplicated with the `zstream redup`
command.

This commit removes the code for sending and receiving deduplicated send
streams.  `zfs send -D` will now print a warning, ignore the `-D` flag,
and generate a regular (non-deduplicated) send stream.  `zfs receive` of
a deduplicated send stream will print an error message and fail.

The resulting code simplification (especially in the kernel's support
for receiving dedup streams) should help enable future performance
enhancements.

Several new tests are added which leverage `zstream redup`.

Signed-off-by: Matthew Ahrens <[email protected]>
@ahrens ahrens added Component: Send/Recv "zfs send/recv" feature Status: Code Review Needed Ready for review and testing Type: Feature Feature request or new feature labels Apr 15, 2020
@codecov-io
Copy link

codecov-io commented Apr 16, 2020

Codecov Report

Merging #10212 into master will decrease coverage by 13.57%.
The diff coverage is 38.46%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master   #10212       +/-   ##
===========================================
- Coverage   79.38%   65.80%   -13.58%     
===========================================
  Files         388      306       -82     
  Lines      123392   105776    -17616     
===========================================
- Hits        97953    69611    -28342     
- Misses      25439    36165    +10726     
Flag Coverage Δ
#kernel ?
#user 65.80% <38.46%> (+0.30%) ⬆️
Impacted Files Coverage Δ
include/sys/dmu.h 100.00% <ø> (ø)
lib/libzfs_core/libzfs_core.c 86.12% <ø> (-0.34%) ⬇️
module/zfs/dmu.c 65.38% <ø> (-21.22%) ⬇️
module/zfs/dmu_recv.c 0.00% <0.00%> (-76.91%) ⬇️
lib/libzfs/libzfs_sendrecv.c 75.75% <25.00%> (-0.70%) ⬇️
cmd/zfs/zfs_main.c 82.56% <100.00%> (-0.02%) ⬇️
module/zfs/objlist.c 0.00% <0.00%> (-100.00%) ⬇️
module/zfs/pathname.c 0.00% <0.00%> (-100.00%) ⬇️
include/sys/dmu_redact.h 0.00% <0.00%> (-100.00%) ⬇️
include/sys/dmu_traverse.h 0.00% <0.00%> (-100.00%) ⬇️
... and 236 more

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 a7929f3...75c11bd. Read the comment docs.

"deprecated, and will be removed in a\n"
"future release. (In the future, the flag will be "
"accepted, but a\n"
"regular, non-deduplicated stream will be "
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this actually going into a separate release from the previous patch? If not, we might be rolling forwards with this a bit too quickly

Copy link
Member Author

@ahrens ahrens Apr 22, 2020

Choose a reason for hiding this comment

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

Yes, the previous commit which added this message is being backported to 0.8.4, but this commit won't be backported, it will be released with 2.0.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Apr 22, 2020
@behlendorf behlendorf merged commit 196bee4 into openzfs:master Apr 23, 2020
as-com pushed a commit to as-com/zfs that referenced this pull request Jun 20, 2020
Deduplicated send streams (i.e. `zfs send -D` and `zfs receive` of such
streams) are deprecated.  Deduplicated send streams can be received by
first converting them to non-deduplicated with the `zstream redup`
command.

This commit removes the code for sending and receiving deduplicated send
streams.  `zfs send -D` will now print a warning, ignore the `-D` flag,
and generate a regular (non-deduplicated) send stream.  `zfs receive` of
a deduplicated send stream will print an error message and fail.

The resulting code simplification (especially in the kernel's support
for receiving dedup streams) should help enable future performance
enhancements.

Several new tests are added which leverage `zstream redup`.

Reviewed-by: Paul Dagnelie <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matthew Ahrens <[email protected]>
Issue openzfs#7887
Issue openzfs#10117
Issue openzfs#10156
Closes openzfs#10212 
(cherry picked from commit 196bee4)
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
Deduplicated send streams (i.e. `zfs send -D` and `zfs receive` of such
streams) are deprecated.  Deduplicated send streams can be received by
first converting them to non-deduplicated with the `zstream redup`
command.

This commit removes the code for sending and receiving deduplicated send
streams.  `zfs send -D` will now print a warning, ignore the `-D` flag,
and generate a regular (non-deduplicated) send stream.  `zfs receive` of
a deduplicated send stream will print an error message and fail.

The resulting code simplification (especially in the kernel's support
for receiving dedup streams) should help enable future performance
enhancements.

Several new tests are added which leverage `zstream redup`.

Reviewed-by: Paul Dagnelie <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matthew Ahrens <[email protected]>
Issue openzfs#7887
Issue openzfs#10117
Issue openzfs#10156
Closes openzfs#10212
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Send/Recv "zfs send/recv" feature Status: Accepted Ready to integrate (reviewed, tested) Type: Feature Feature request or new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants