Consolidate: fix for consolidate job's client name not being correctly shown#1474
Merged
arogge merged 9 commits intobareos:masterfrom Jun 12, 2023
Conversation
fa40f39 to
221edcb
Compare
sebsura
requested changes
May 30, 2023
systemtests/tests/multiple-clients/etc/bareos/bareos-dir.d/pool/Differential.conf
Outdated
Show resolved
Hide resolved
systemtests/tests/multiple-clients/etc/bareos/bareos-fd.d/client/myself.conf.in
Outdated
Show resolved
Hide resolved
systemtests/tests/multiple-clients/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
Outdated
Show resolved
Hide resolved
systemtests/tests/multiple-clients/etc/secondclient/bareos-fd.d/client/myself.conf.in
Outdated
Show resolved
Hide resolved
systemtests/tests/multiple-clients/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
Outdated
Show resolved
Hide resolved
bcae8bc to
a3d5e0b
Compare
a3d5e0b to
e5c7cea
Compare
sebsura
requested changes
Jun 2, 2023
Contributor
sebsura
left a comment
There was a problem hiding this comment.
Looks fine to me. You need to apply bareos-check-sources once though.
11bd3ed to
b4f2ace
Compare
14 tasks
sebsura
approved these changes
Jun 5, 2023
b4f2ace to
783027e
Compare
added 8 commits
June 12, 2023 08:57
when getting the client of the different jobs that need to be consolidated, the `clientid` of the `job` record of the original consolidation job gets overridden by that of the jobs being consolidated. At the end of the operation, the name of the client of the last job being treated persists as the original Consolidate job client. Other data also gets overridden, so the current fix saves the resource and job record members of the OG Consolidation jcr before starting the loop and brings them back during cleanup
and move ConsolidateCleanup call to job.cc
975e04b to
8bd921d
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
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!
When doing a consolidation job of multiple jobs on of different clients, the original Client of the Consolidate job is overridden to that of the client of the last job being treated.
This PR fixes the issue.
As a small side improvement, this PR introduces the Boy Scout Rule to the developer documentation and adds a link to it in the PR template.
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