K8SPXC-1144: mark backups as PITR unready in the storage #2261
+127
−26
Conversation
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
pooknull
requested review from
egegunes,
eleo007,
gkech,
hors,
jvpasinatto,
nmarukovich and
valmiranogueira
as code owners
egegunes
reviewed
Nov 25, 2025
Comment on lines
120
to
131
| objReader, err := stg.GetObject(ctx, filepath) | ||
| if err != nil { | ||
| if !errors.Is(err, storage.ErrObjectNotFound) { | ||
| return false, errors.Wrap(err, "get pitr-not-ready file from storage") | ||
| } | ||
| found = false | ||
| } else { | ||
| objReader.Close() | ||
| } | ||
|
|
||
| return !found, nil | ||
| } |
Contributor
There was a problem hiding this comment.
feel free the reject but i think this version can be more readable and we can get rid of found variable
Suggested change
| objReader, err := stg.GetObject(ctx, filepath) | |
| if err != nil { | |
| if !errors.Is(err, storage.ErrObjectNotFound) { | |
| return false, errors.Wrap(err, "get pitr-not-ready file from storage") | |
| } | |
| found = false | |
| } else { | |
| objReader.Close() | |
| } | |
| return !found, nil | |
| } | |
| if err == nil || errors.Is(err, storage.ErrObjectNotFound) { | |
| objReader.Close() | |
| return false, nil | |
| } | |
| return false, errors.Wrap(err, "get pitr-not-ready file from storage") |
egegunes
previously approved these changes
Nov 28, 2025
gkech
reviewed
Nov 28, 2025
cmd/pitr/collector/collector.go
Outdated
| lastSetFilePrefix string = "last-binlog-set-" // filename prefix for object where the last binlog set will stored | ||
| gtidPostfix string = "-gtid-set" // filename postfix for files with GTID set | ||
| timelinePath string = "/tmp/pitr-timeline" // path to file with timeline | ||
| lastSetFilePrefix string = "last-binlog-set-" // filename prefix for object where the last binlog set will stored |
pkg/pxc/backup/pitr.go
Outdated
| } | ||
| scli, err := storageFunc(ctx, opts) | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to create s3 client") |
Contributor
There was a problem hiding this comment.
Is the s3 client always the case for storage?
| filepath := bcp.Status.Destination.BackupName() + "." + naming.PITRNotReady | ||
| objReader, err := stg.GetObject(ctx, filepath) | ||
| if err == nil { | ||
| objReader.Close() |
Contributor
There was a problem hiding this comment.
should we handle the error this returns?
Contributor
There was a problem hiding this comment.
At least we can log it, maybe
Contributor
Author
There was a problem hiding this comment.
We handle it below
Collaborator
commit: 65dc354 |
egegunes
approved these changes
Dec 1, 2025
gkech
approved these changes
Dec 1, 2025
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.
https://perconadev.atlassian.net/browse/K8SPXC-1144
DESCRIPTION
Problem:
When performing a PITR restore using
backupSource, we currently do not throw an error when a gap is detected.Solution:
The operator should create a file named
<backup-name>.pitr-not-readyin the storage whenever a gap is detected.Before starting a restore, the operator must check whether this file exists in the storage, and if it does, the operator should throw an error.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability