stored: fix some sd error messages; add additional check during restore; split up always-incremental-consolidate test#1722
Merged
BareosBot merged 8 commits intobareos:masterfrom Apr 15, 2024
Conversation
c33c117 to
70c99b7
Compare
pstorz
approved these changes
Apr 15, 2024
6913919 to
899951e
Compare
This was referenced Apr 15, 2024
The filedaemon requires that each file starts with an attribute record, since this is the only way to know the files name. To make sure nothing bad happened we need to actively check that this precondition holds.
double quotes stop globbing and as such we tried to delete a file/directory called '*', which did not exist. Also adds tracing to the fd since this tests an fd plugin.
904f0a3 to
1cf8e01
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Thank you for contributing to the Bareos Project!
This pr adds a missing sd error message as well as fixing one situation where we are sending the wrong one.
Additionally we added a check during restore on the fd, that double checks that we do not merge two different files,
which may happen if the restore stream get messed up somehow (this situation came up in the real world).
Lastly it splits up the test always-incremental-consolidate into multiple tests + test-setup. Additionally this test now does not auto fail on a repeat.
Please check
If you have any questions or problems, please give a comment in the PR.
Helpful documentation and best practices
Checklist for the reviewer of the PR (will be processed by the Bareos team)
Make sure you check/merge the PR using
devtools/pr-toolto have some simple automated checks run and a proper changelog record added.General
Source code quality
Tests