Skip to content

dird: keep copy and migration control/administrative jobs#1421

Merged
pstorz merged 6 commits intobareos:masterfrom
alaaeddineelamri:dev/alaaeddineelamri/master/s5429-copy-jobs-deleted-immediately
Apr 6, 2023
Merged

dird: keep copy and migration control/administrative jobs#1421
pstorz merged 6 commits intobareos:masterfrom
alaaeddineelamri:dev/alaaeddineelamri/master/s5429-copy-jobs-deleted-immediately

Conversation

@alaaeddineelamri
Copy link
Contributor

@alaaeddineelamri alaaeddineelamri commented Mar 22, 2023

Description

In bareos 22, copy and migration control/administrative jobs were deleted directly on completion. This turned out to not be suitable in certain situations where such information would be useful. This PR reverts that action and thus keep copy and migration control jobs jobs.

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

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-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Check backport line
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR
  • Required Backports have been created
Tests
  • Decision taken that a test is required (if not, then remove this paragraph)
  • The choice of the type of test (unit test or systemtest) is reasonable
  • Testname matches exactly what is being tested
  • On a fail, output of the test leads quickly to the origin of the fault

@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/master/s5429-copy-jobs-deleted-immediately branch from 0475e51 to 838d3da Compare March 22, 2023 13:07
@alaaeddineelamri alaaeddineelamri marked this pull request as draft March 22, 2023 13:08
@alaaeddineelamri alaaeddineelamri marked this pull request as ready for review March 23, 2023 09:24
@bruno-at-bareos bruno-at-bareos requested a review from pstorz March 23, 2023 10:49
@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/master/s5429-copy-jobs-deleted-immediately branch from 18865f8 to 0e3b844 Compare March 27, 2023 08:05
Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one small typo, see comments. Triggered to build again as last build was not successful.

if [[ $(grep -c "| 3 |" "$query_results") -ne "2" ]]; then
echo "The necessary amount of migration related jobs are not available in the catalog."
if [[ $(grep -c "|.*M.*|" "$query_results") -ne "3" ]]; then
echo "Former backup jobs were not succesfully converted to 'Migrated Jobs'."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
echo "Former backup jobs were not succesfully converted to 'Migrated Jobs'."
echo "Former backup jobs were not successfully converted to 'Migrated Jobs'."

@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/master/s5429-copy-jobs-deleted-immediately branch from 0e3b844 to d94c722 Compare April 3, 2023 10:01
Alaa Eddine Elamri and others added 6 commits April 6, 2023 15:06
* added testing for copy upgrades
* update impossible copy job test to accommodate volume
 pruning in 02-copy
* test worker job deletion after new migrate jobs pruning
@pstorz pstorz force-pushed the dev/alaaeddineelamri/master/s5429-copy-jobs-deleted-immediately branch from 27c2cc1 to 9e5dd30 Compare April 6, 2023 13:06
@pstorz pstorz merged commit 5a80c3f into bareos:master Apr 6, 2023
@pstorz pstorz deleted the dev/alaaeddineelamri/master/s5429-copy-jobs-deleted-immediately branch April 6, 2023 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants