ua_restore: change restore argument handling#1516
Merged
BareosBot merged 13 commits intobareos:masterfrom Aug 23, 2023
Merged
Conversation
276f141 to
456811d
Compare
456811d to
fad2229
Compare
alaaeddineelamri
previously approved these changes
Aug 15, 2023
Contributor
alaaeddineelamri
left a comment
There was a problem hiding this comment.
just realized the tests are not passing on jenkins
just realized the tests are not passing on jenkins
552e067 to
964821e
Compare
96f38ad to
f296081
Compare
alaaeddineelamri
approved these changes
Aug 22, 2023
This change will make the order of arguments passed to the restore command mostly irrelevant. This means that restore file=... jobid=... and restore select before=... will work as one would naivly expect; without this change both jobid=... and before=... would be silently ignored!
If autoxflate is enabled then autoxflate will set up these buffers. If autoxflate is disabled then it will not. As such we need to ensure to set up the buffers when they are are not yet set up!
Instead of implicitly using ua->cmd, we instead pass the parameter explicitly.
if "$rscripts/diff.pl" -s "${dest}" -d "${restorepath}"; then
result=$?
fi
means: if diff.pl succeeds (i.e. return 0), then set result to 0.
This is not very useful. Instead the script should signal an error
when diff.pl does _not_ succeed!
bd9244f to
62f1cb8
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!
restore does not parse its arguments correctly. It only considers a single file=/directory= keyword and only considers jobid=/current/before= if they are specified before their respective command.
This PR changes the argument parsing such that first all keywords are looked at and then the found commands are executed.
It also contains a fix for bextract not setting up decompression buffers when compression is on but autoxflate is not.
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