-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Fix incremental receive silently failing for recursive sends #14568
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Paul Dagnelie <pcd@delphix.com>
ryao
reviewed
Mar 6, 2023
Signed-off-by: Paul Dagnelie <pcd@delphix.com>
In the latest commit I had to remove the "heal" option from the libzfs test, because the heal parameter only works with an existing dataset (and not having it requires not having an existing dataset), which the libzfs input test infrastructure isn't set up for. |
behlendorf
reviewed
Mar 6, 2023
Signed-off-by: Paul Dagnelie <pcd@delphix.com>
behlendorf
approved these changes
Mar 8, 2023
There's always something, reported by the CI with this change.
|
Signed-off-by: Paul Dagnelie <pcd@delphix.com>
mcmilk
pushed a commit
to mcmilk/zfs
that referenced
this pull request
Mar 13, 2023
The problem occurs because dmu_recv_begin pulls in the payload and next header from the input stream in order to use the contents of the begin record's nvlist. However, the change to do that before the other checks in dmu_recv_begin occur caused a regression where an empty send stream in a recursive send could have its END record consumed by this, which broke the logic of recv_skip. A test is also included to protect against this case in the future. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Paul Dagnelie <pcd@delphix.com> Closes openzfs#12661 Closes openzfs#14568
lundman
pushed a commit
to openzfsonwindows/openzfs
that referenced
this pull request
Mar 16, 2023
The problem occurs because dmu_recv_begin pulls in the payload and next header from the input stream in order to use the contents of the begin record's nvlist. However, the change to do that before the other checks in dmu_recv_begin occur caused a regression where an empty send stream in a recursive send could have its END record consumed by this, which broke the logic of recv_skip. A test is also included to protect against this case in the future. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Paul Dagnelie <pcd@delphix.com> Closes openzfs#12661 Closes openzfs#14568
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
See #12661
Description
The problem occurs because
dmu_recv_begin
pulls in the payload and next header from the input stream in order to use the contents of the begin record's nvlist. However, the change to do that before the other checks indmu_recv_begin
occur caused a regression where an empty send stream in a recursive send could have its END record consumed by this, which broke the logic ofrecv_skip
. A test is also included to protect against this case in the future.How Has This Been Tested?
Using the reproducer script from the issue.
Types of changes
Checklist:
Signed-off-by
.