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

Backport (2.1): Fix dmu_recv_stream test for resumable #12142

Closed
wants to merge 1 commit into from

Conversation

ghost
Copy link

@ghost ghost commented May 27, 2021

Use dsl_dataset_has_resume_receive_state()
not dsl_dataset_is_zapified() to check if
stream is resumable.

Reviewed-by: Matthew Ahrens [email protected]
Reviewed-by: Alek Pinchuk [email protected]
Reviewed-by: Ryan Moeller [email protected]
Signed-off-by: Paul Zuchowski [email protected]
Closes #12034

Motivation and Context

Description

How Has This Been Tested?

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)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

Use dsl_dataset_has_resume_receive_state()
not dsl_dataset_is_zapified() to check if
stream is resumable.

Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: Alek Pinchuk <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Paul Zuchowski <[email protected]>
Closes openzfs#12034
@ghost ghost assigned tonyhutter May 27, 2021
ghost pushed a commit to truenas/ports that referenced this pull request May 27, 2021
The uninitialized variable can lead to receive errors or panic.

New local commits:

* truenas/zfs@24efa805a Fix dmu_recv_stream test for resumable

(Upstream backport in progress openzfs/zfs#12142)
@behlendorf
Copy link
Contributor

Closing. Included in zfs-2.1.0-rc6.

@behlendorf behlendorf closed this May 28, 2021
@ghost ghost deleted the backport-recv-fix-2.1 branch May 28, 2021 18:08
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.

3 participants