core: make resource/configuration locking safer#1325
Merged
arogge merged 7 commits intobareos:masterfrom Jan 26, 2023
Merged
Conversation
arogge
reviewed
Dec 1, 2022
| Jmsg(nullptr, M_FATAL, 0, | ||
| _("TLS required but not configured in BAREOS.\n")); | ||
| UnlockRes(my_config); | ||
| ; |
arogge
reviewed
Dec 1, 2022
| int64_t StorageId; | ||
|
|
||
| LockRes(my_config); | ||
|
|
arogge
reviewed
Dec 1, 2022
Member
arogge
left a comment
There was a problem hiding this comment.
If I did it right, then foreach_res() is now reload-safe. So if you only read the configuration in the loop body and it is basically just
lock();
foreach_res() {}
unlock();
then locking the configuration should not be required anymore.
52f94fb to
d66fc3c
Compare
d66fc3c to
bc37afd
Compare
bc37afd to
3c8f42a
Compare
arogge
requested changes
Jan 19, 2023
Member
arogge
left a comment
There was a problem hiding this comment.
I guess it makes sense to make ResLocker non-copyable and non-movable. Besides that it looks great.
2c0bab0 to
3e4d227
Compare
arogge
approved these changes
Jan 20, 2023
57b98de to
4e4d665
Compare
974672b to
bf067f6
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
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!
Description
When interacting with configuration within the code, we usually need to lock it and then unlock when we finish.
Locking and unlocking is currently done manually, which would increase the risk of locking and forgetting to unlock, or unlocking a config that is not locked.
This PR tries to mitigate that and make configuration locking and unlocking a bit more resilient
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)
General
Separate commit for CHANGELOG.md ("update CHANGELOG.md"). The PR number is correct.Source code quality
bareos-check-sources --since-mergedoes not report any problems