Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cats: BareosDb: FilterZeroFileJobs returned list now is sorted #1175

Conversation

alaaeddineelamri
Copy link
Contributor

@alaaeddineelamri alaaeddineelamri commented Apr 27, 2022

Backport of PR#1172 to bareos-21

Description

This PR orders zero-file jobids to be purged and makes always-incremental-consolidate systemtest more stable.
It also adds modifications to the always-incremental-consolidate that were not added with previous backports.

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)

General
  • PR name is meaningful
  • Purpose of the PR is understood
  • Separate commit for this PR in the CHANGELOG.md, PR number referenced is same
  • Commit descriptions are understandable and well formatted
  • If backport: add original PR number and target branch at top of this file: Backport of PR#000 to bareos-2x
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
  • bareos-check-sources --since-merge does not report any problems
  • git status should not report modifications in the source tree after building and testing

@alaaeddineelamri alaaeddineelamri changed the title cats: BareosDb::FilterZeroFileJobs returned list now is sorted cats: BareosDb: FilterZeroFileJobs returned list now is sorted Apr 27, 2022
@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/bareos-21/fix-always-incremental-test branch from a6911da to ba7e9f4 Compare April 28, 2022 08:39
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.

Hello,
I have the following remarks:

  • PR description of f1abbde has an empty line with "s"
  • Copyright year of always-incremental-consolidate/CMakeLists.txt (found by check-sources)

@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/bareos-21/fix-always-incremental-test branch from ba7e9f4 to 70f0954 Compare April 29, 2022 12:03
to `always-incremental-consolidate`
introduced testing function that uses grep
to check expected strings in log files

(cherry picked from commit f4d68c7)
Makes systemtest `always-incremental-consolidate` more reliable,
as its results can sometimes show a false negative when jobids for
zero files are not well ordered

(cherry picked from commit e4c9fdb)
@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/bareos-21/fix-always-incremental-test branch from 70f0954 to 27bebd9 Compare April 29, 2022 12:04
@pstorz pstorz self-requested a review April 29, 2022 12:12
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.

Good work!

@pstorz pstorz merged commit 6909372 into bareos:bareos-21 Apr 29, 2022
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.

None yet

2 participants