Skip to content

ndmp-bareos: Introduce incremental loop, restore 2nd file explicitly#2269

Merged
BareosBot merged 7 commits intobareos:masterfrom
pstorz:dev/pstorz/master/ndmp-bareos
Jul 17, 2025
Merged

ndmp-bareos: Introduce incremental loop, restore 2nd file explicitly#2269
BareosBot merged 7 commits intobareos:masterfrom
pstorz:dev/pstorz/master/ndmp-bareos

Conversation

@pstorz
Copy link
Member

@pstorz pstorz commented May 12, 2025

ndmp-bareos

We introduce a second incremental file in the systemtest, and we explicitly restore the file modified in the first incremental.

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
  • Required backport PRs have been created
  • Correct milestone is set
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
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 bruno-at-bareos May 12, 2025 13:59
@pstorz pstorz changed the title baeos-ndmp: Introduce incremental loop, restore one file explicitly bareos-ndmp: Introduce incremental loop, restore one file explicitly May 12, 2025
@pstorz pstorz changed the title bareos-ndmp: Introduce incremental loop, restore one file explicitly ndmp-bareos: Introduce incremental loop, restore one file explicitly May 12, 2025
@bruno-at-bareos bruno-at-bareos force-pushed the dev/pstorz/master/ndmp-bareos branch from 248da1d to 364fd05 Compare May 21, 2025 15:54
@bruno-at-bareos bruno-at-bareos force-pushed the dev/pstorz/master/ndmp-bareos branch from 364fd05 to 72f9757 Compare July 16, 2025 14:59
@bruno-at-bareos bruno-at-bareos added this to the 25.0.0 milestone Jul 17, 2025
@bruno-at-bareos bruno-at-bareos force-pushed the dev/pstorz/master/ndmp-bareos branch from 72f9757 to cc0a18d Compare July 17, 2025 07:33
Copy link
Contributor

@bruno-at-bareos bruno-at-bareos left a comment

Choose a reason for hiding this comment

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

All goods now. Approved.

pstorz and others added 6 commits July 17, 2025 13:50
We introduce a second incremental file in the systemtest,
and we explicitly restore the file present in the first incremental.
- increase timeout test barely use more than 300s
- update copyright and cmake format
- systemtest add a second file

We add a second file to the dataset so restore won't pick the last
file of the data stream.

- remove unsupported -v flag on omnios for rm command
- use cleanup_isilon function
- ensure all resource configuration are correctly used in tests
- remove unsupported -v flag of rm command on omnios
- exit 0 early in case we are not disabled

Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
@bruno-at-bareos bruno-at-bareos force-pushed the dev/pstorz/master/ndmp-bareos branch from cc0a18d to 8ba13c1 Compare July 17, 2025 11:52
@bruno-at-bareos bruno-at-bareos changed the title ndmp-bareos: Introduce incremental loop, restore one file explicitly ndmp-bareos: Introduce incremental loop, restore 2nd file explicitly Jul 17, 2025
@BareosBot BareosBot merged commit b50f8ed into bareos:master Jul 17, 2025
1 check was pending
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.

3 participants