Fix non-recurring backups #509
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gerlowskija
approved these changes
Dec 23, 2022
| @@ -146,7 +145,7 @@ func (r *SolrBackupReconciler) Reconcile(ctx context.Context, req ctrl.Request) | |||
| } | |||
|
|
|||
| // Schedule the next backupTime, if it doesn't have a next scheduled time, it has recurrence and the current backup is finished | |||
| if backup.Status.IndividualSolrBackupStatus.Finished { | |||
| if backup.Status.IndividualSolrBackupStatus.Finished && backup.Spec.Recurrence.IsEnabled() { | |||
There was a problem hiding this comment.
[+1] Weird that the comment on L147 mentions recurrence-being-enabled as being a prereq, but we never checked for it before now. Must've just been an oversight on my part?
Anyway, good catch!
Good call, just included since I was going mad trying to fix it so many ways before realizing that I wasn't testing the changes at all.... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#455 introduced a bug for non-recurring backups that was unearthed while working on #507
Basically we need to only update the
NextScheduledTimestampifrecurrenceis enabled.I also restructured the logic to hopefully make it more clear when backup logic should be run.