K8SPSMDB-1339: Validate PiTR target before starting restore#1908
Merged
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| "sigs.k8s.io/controller-runtime/pkg/client/fake" | ||
|
|
||
| "github.com/percona/percona-backup-mongodb/pbm/defs" | ||
| psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1" |
Contributor
There was a problem hiding this comment.
[goimports-reviser] reported by reviewdog 🐶
Suggested change
| psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1" | |
| psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1" |
Contributor
There was a problem hiding this comment.
we can apply this, it makes sense.
egegunes
requested review from
eleo007,
gkech,
hors,
jvpasinatto,
nmarukovich and
pooknull
as code owners
gkech
reviewed
May 27, 2025
| return errors.Wrap(err, "failed to validate backup") | ||
| } | ||
|
|
||
| if pitr := cr.Spec.PITR; pitr != nil { |
Contributor
There was a problem hiding this comment.
Given that the nesting here with alll these if else and switch statements does not help readability a lot, maybe we can early return the opposite check like that:
pitr := cr.Spec.PITR
if pitr == nil {
return nil
}
After that the switch can be moved on the same level.
| "sigs.k8s.io/controller-runtime/pkg/client/fake" | ||
|
|
||
| "github.com/percona/percona-backup-mongodb/pbm/defs" | ||
| psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1" |
Contributor
There was a problem hiding this comment.
we can apply this, it makes sense.
| }, | ||
| }, | ||
| }, | ||
| "", |
Contributor
There was a problem hiding this comment.
this is not needed, the default value is empty string already.
Contributor
Author
There was a problem hiding this comment.
go forces me to set values for each field in struct
| Namespace: ns, | ||
| }, | ||
| Spec: psmdbv1.PerconaServerMongoDBBackupSpec{ | ||
| Type: defs.LogicalBackup, |
Contributor
There was a problem hiding this comment.
Is this option here doing anything for the test? Seems wrong because this test is regarding physical backups.
Contributor
Author
There was a problem hiding this comment.
we use the status field for our logic, but fixed
| runtimeObjs := []client.Object{&secret, tt.restore, cluster, tt.backup} | ||
| r := fakeReconciler(runtimeObjs...) | ||
| err := r.validate(ctx, tt.restore, cluster) | ||
| if len(tt.expectedErr) > 0 { |
Contributor
There was a problem hiding this comment.
We can simply if tt.expectedErr != "" { here instead of calculating the len()
pull-request-size
bot
added
size/XL
pull-request-size
bot
added
size/L
gkech
previously approved these changes
May 29, 2025
nmarukovich
previously approved these changes
May 29, 2025
pooknull
previously approved these changes
May 29, 2025
egegunes
dismissed stale reviews from pooknull, gkech, and nmarukovich
via
6880ab6
gkech
previously approved these changes
Jun 3, 2025
pull-request-size
bot
added
size/XL
Comment on lines
41
to
+42
| echo "Still in progress at $(date)" | ||
| sleep 10 | ||
| sleep 120 |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| echo "Still in progress at $(date)" | |
| sleep 10 | |
| sleep 120 | |
| echo "Still in progress at $(date)" | |
| sleep 120 |
12 tasks
Collaborator
commit: 4f95fb9 |
hors
approved these changes
Jun 4, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
CHANGE DESCRIPTION
This PRs add necessary validations for point-in-time-recovery target in PerconaServerMongoDBRestore objects:
pitr.typeisdate, backup's last write must not be equal topitr.date.pitr.typeisdate, backup's last write must not be later thanpitr.date.pitr.typeisdate, PBM must have required oplogs that includepitr.datein its metadata.pitr.typeislatest, PBM must have at least one oplog chunk in its metadata.CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability