Skip to content

dird: fix llist jobs current not displaying correct data#1025

Merged
pstorz merged 5 commits intobareos:masterfrom
alaaeddineelamri:dev/alaaeddineelamri/master/fix-llist-jobs-current
Dec 16, 2021
Merged

dird: fix llist jobs current not displaying correct data#1025
pstorz merged 5 commits intobareos:masterfrom
alaaeddineelamri:dev/alaaeddineelamri/master/fix-llist-jobs-current

Conversation

@alaaeddineelamri
Copy link
Contributor

@alaaeddineelamri alaaeddineelamri commented Dec 15, 2021

Description:

PR #1007 introduced a new duration column when listing jobs. Since the column was added in the middle of the selection, the following columns positions were shifted. Those positions are important for certain filtering to happen. Since positions are changed, filtering does not work properly resulting in the issue. This PR fixes the problem and adds extra tests.

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
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

pstorz
pstorz previously requested changes Dec 16, 2021
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.

You have removed the "count current" test, but that should work again if PR #1026 is merged.
So I would suggest we keep that test in this PR, and merge #1026 first.

@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/master/fix-llist-jobs-current branch from 8829945 to 5a67612 Compare December 16, 2021 13:20
caught wrongly deleted column, and added `job.`
@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/master/fix-llist-jobs-current branch 2 times, most recently from 3f47abd to 93ddb03 Compare December 16, 2021 14:44
Alaa Eddine Elamri added 4 commits December 16, 2021 16:37
Setting ACL filters and resource filters requires knowledge of the 
exact position of the query columns. Since the query was updated
to show duration which was put just in the middle after starttime
and endtime, the subsequent columns positions were incremented
which rendered the code obsolete.

So this commit updates the positions of the required columns
removed initial test, and changed it with a python one
@alaaeddineelamri alaaeddineelamri force-pushed the dev/alaaeddineelamri/master/fix-llist-jobs-current branch from 93ddb03 to c22d267 Compare December 16, 2021 15: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.

Good work

@pstorz pstorz merged commit 99a6134 into bareos:master Dec 16, 2021
@pstorz pstorz deleted the dev/alaaeddineelamri/master/fix-llist-jobs-current branch December 16, 2021 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants