stored: fix not counting files correctly in mac jobs when autoxflate is enabled#1745
Merged
BareosBot merged 8 commits intobareos:masterfrom Mar 27, 2024
Merged
Conversation
It should only start once the job was canceled and not once the job was started ...
The socket may be closed if the job was canceled in an unfortunate moment, which currently causes the sd to crash. Instead we should just log this and go on normally.
pstorz
approved these changes
Mar 27, 2024
6 tasks
6 tasks
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
4 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 fixes a bug that causes the sd to miscount the number of files during a internal mac job, if autoxflate is enabled.
The basic problem is that the VSId & VSTime are not reset correctly in the callback in that case, leading to splitting up files on block boundaries (i.e. 1 file becomes 2, if split on blocks), because the ReadRecords() routine thinks that we start reading data from a different job.
Also fixes a mistake in the last msgchan refactor that leads stops all sd<>sd jobs that take more than 30 seconds.
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