Skip to content

Fix #1257: Prune volume command may crash the director#546

Merged
arogge merged 2 commits intobareos:masterfrom
arogge:dev/arogge/master/fix-1257
Jun 29, 2020
Merged

Fix #1257: Prune volume command may crash the director#546
arogge merged 2 commits intobareos:masterfrom
arogge:dev/arogge/master/fix-1257

Conversation

@arogge
Copy link
Member

@arogge arogge commented Jun 25, 2020

This PR adds a test-case to the prune-volume systemtest that checks the broken behaviour. It also contains a fix for the issue.

@arogge arogge requested a review from pstorz June 25, 2020 11:54
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.

Looks correct, thanky you very much. Sorry for introducing this problem.

@arogge
Copy link
Member Author

arogge commented Jun 25, 2020

Nevermind, I was the one who didn't notice it during review.

arogge added 2 commits June 25, 2020 16:15
Issue bareos#1257: Prune volume command may crash the director

The test now also runs manual pruning and checks that the job-message
emitted contains the correct volume name.
Fixes bareos#1257: Prune volume command may crash the director

Previously the mr->VolumeName to fill the %s in the Jmsg was missing.
@arogge arogge force-pushed the dev/arogge/master/fix-1257 branch from 0abc124 to 664cd2e Compare June 25, 2020 14:15
@arogge arogge merged commit 94a0525 into bareos:master Jun 29, 2020
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