Skip to content

Refactor config reloading by using shared pointers instead of callbacks#1151

Merged
pstorz merged 36 commits intomasterfrom
dev/pstorz/master/refactor-config-reload
Aug 11, 2022
Merged

Refactor config reloading by using shared pointers instead of callbacks#1151
pstorz merged 36 commits intomasterfrom
dev/pstorz/master/refactor-config-reload

Conversation

@pstorz
Copy link
Member

@pstorz pstorz commented Apr 6, 2022 •
edited by alaaeddineelamri
Loading

The original way of handling the reload mechanism used callbacks that were registerd on every job start with internal job counters that would free the used configuration resources when no job is using it anymore.

Now the new mechanism simply uses shared pointers that own the configuration resources. On every job start, each job becomes shared owner of the resources, and on successfull reload the prevous confiugration resources are released by the director itself, so that only currently using jobs own the resource. When the last job using the configuration resources ends the resources are automatically freed.

The definitions of resources have been simplified by starting the resource definitons now with 0 in all daemons instead of having a number for start and end.

In addition, the formerly used static global definitions of the resources now have been converted to be dynamic.

Thank you for contributing to the Bareos Project!

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

@pstorz pstorz requested a review from arogge April 7, 2022 07:13
@alaaeddineelamri alaaeddineelamri mentioned this pull request Apr 21, 2022
Merged
12 tasks
@pstorz pstorz force-pushed the dev/pstorz/master/refactor-config-reload branch from a8d7fb4 to 31b4e2c Compare April 26, 2022 08:59
polz113 pushed a commit to polz113/bareos that referenced this pull request May 3, 2022
@frb121
webui: add inchanger column to volume tables
f36295d 
In order to quickly identify which volumes are available by your
autochanger an additional column is introduced on volume tables.

Fixes bareos#1151: bareos webui does not show the inchanger flag for volumes
arogge
arogge reviewed Jun 13, 2022
View reviewed changes
pstorz
pstorz commented Jul 21, 2022
View reviewed changes
Copy link
Member Author

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

Looks good to me. Good work!

@pstorz pstorz force-pushed the dev/pstorz/master/refactor-config-reload branch 3 times, most recently from f24dc6d to bd91589 Compare July 25, 2022 08:39
@pstorz pstorz force-pushed the dev/pstorz/master/refactor-config-reload branch from aebcb81 to 8dc329d Compare August 1, 2022 10:01
@pstorz pstorz mentioned this pull request Aug 1, 2022
Merged
13 tasks
pstorz added 12 commits August 4, 2022 11:50
@pstorz
configparser: simplify resource tables for all daemons
8497f72 
Remove the indexes of the resource tables for each daemons by starting
all enums at 0 instead of a individual startnumber.

That makes access much easier as we do not need R_FIRST and R_LAST
anymore.
@pstorz
systemtest ai-consolidate-ignore-duplicate-job: print logfile on failure
8a8e15f
@pstorz
ua_status.cc: remove redundant comments
9af9bff
@pstorz
config: introduce ResHeadContainer
dad0ea1
@pstorz
jcr_private: add res_head_container shared pointer
8451355
@pstorz
dir config: JT_SYSTEM do not count
7a2ce28
@pstorz
config: dynamic res_head for dir works
3f71bfa
@pstorz
config: Removed static global res_heads
2ca777e
@pstorz
config: make ResHeadContainer a class
b5c2ad5
@pstorz
tray-monitor: remove fixed res_head
619db45
@pstorz
config: log res_head being used on job start
2d588d2
@pstorz
parse_conf: use level 10 for Dmsg
8ea2322
pstorz and others added 24 commits August 4, 2022 11:50
@pstorz
fix gtest:setdevice.scan_command_line
88d47f8
@pstorz
logging: add timestamp
421ef4b
@pstorz
config: rename res_head_container_ -> config_resources_container_
4d60c18
@pstorz
config: rename ResHeadContainer -> ConfigResourcesContainer
6f5e168
@pstorz
strftime: avoid %F as it is not avaiable on wincross
aaa5f91
@pstorz
configparser: SaveResource(): don't alias type with rindex
f17942c
@pstorz @arogge
Update core/src/dird/jcr_private.h
7d7f90d 
Co-authored-by: Andreas Rogge <andreas.rogge@bareos.com>
@pstorz
jcr_private.h: remove ~JobControlRecordPrivate()
2c7ae1d
@pstorz
ua_status.cc: remove unneeded empty lines
cb267bf
@pstorz @arogge
Update core/src/lib/parse_conf.cc
9c5a833 
Co-authored-by: Andreas Rogge <andreas.rogge@bareos.com>
@pstorz
parse_conf.cc: use std::make_shared
751bd3d
@pstorz
StoreMigtype(): pass only used params
f8634d4
@pstorz
parse_conf.cc: remove -ConfigurationParser::~ConfigurationParser()
c208b8a
@pstorz @arogge
Update core/src/filed/filed_conf.cc
3607d67 
Co-authored-by: Andreas Rogge <andreas.rogge@bareos.com>
@pstorz
parse_conf.{cc,h}: move class initializers
793fdaa
@pstorz @arogge
Update core/src/dird/jcr_private.h
f57aa50 
Co-authored-by: Andreas Rogge <andreas.rogge@bareos.com>
@pstorz
lib: move TPAsString() to util.h
8880c6d
@pstorz
ConfigResourcesContainer: make timestamp_ and config_ private
9620fe4
@arogge
lib: keep configuration backup in calling code
24356cc
@pstorz
test_config_parser_dir.cc: avoid memleaks in test
22cd42a 
Calling my_config->BackupResourceTable() avoids memleaks if a new config
is parsed while another already exists.
@pstorz
update CHANGELOG.md
b02a9c9
@pstorz
format: apply bareos-check-sources changes
4940ad8
systemtest: enhance commandline options test
a9577b8
dird: revert change that occured during rebase
f96a0b5 
partial revert of commit 
2ca777e
@alaaeddineelamri alaaeddineelamri force-pushed the dev/pstorz/master/refactor-config-reload branch from c4a12e8 to f96a0b5 Compare August 4, 2022 10:47
@pstorz pstorz merged commit d60c4f1 into master Aug 11, 2022
@pstorz pstorz deleted the dev/pstorz/master/refactor-config-reload branch August 11, 2022 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arogge arogge arogge left review comments

+1 more reviewer

@alaaeddineelamri alaaeddineelamri alaaeddineelamri approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@arogge arogge

Labels

requires backport to 21

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@pstorz @arogge @alaaeddineelamri