K8SPSMDB-1219: Minor test improvements #1871
Merged
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
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
egegunes
requested review from
jvpasinatto,
eleo007,
hors,
pooknull,
nmarukovich and
gkech
as code owners
gkech
reviewed
Mar 27, 2025
| write_document "-2nd" | ||
| run_backup $backup_name_minio 2 physical | ||
| compare_latest_restorable_time "${cluster}-rs0" "${backup_name_minio}-2" | ||
| check_recovery "${backup_name_minio}-2" latest "" "-2th" "$cluster" backupSource |
There was a problem hiding this comment.
Maybe here we want to use 3rd? Mentioning this because we have both find-2th.json and find-3rd.json which are identical, but the find-3rd is the right syntax. Also one of these files I think is redundant.
gkech
reviewed
Mar 27, 2025
e2e-tests/functions
Outdated
| @@ -1691,6 +1727,92 @@ format_date() { | |||
| echo $(TZ=UTC $date -d@${timestamp} '+%Y-%m-%d %H:%M:%S') | |||
| } | |||
|
|
|||
| get_bucket_name() { | |||
| local bucket_name=$1 | |||
There was a problem hiding this comment.
This variable should be backup_name given the following kubectl command In L.1733, and how it is used here | $sed -e "s|BUCKET-NAME|$(get_bucket_name "$backup_name")|" \
gkech
reviewed
Mar 27, 2025
| check_recovery "${backup_name_minio}-2" latest "" "-2th" "$cluster" backupSource | ||
|
|
||
| desc 'disable pitr' | ||
| kubectl patch psmdb "some-name" --type='merge' --patch '{"spec": {"backup": {"pitr": {"enabled": false}}}}' |
There was a problem hiding this comment.
minor: Instead of hardcoding some-name throughout this function, we can use the variable cluster
gkech
reviewed
Mar 27, 2025
| @@ -304,6 +304,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) getBackup(ctx context.Context, cr | |||
| Namespace: cr.Namespace, | |||
| }, | |||
| Spec: psmdbv1.PerconaServerMongoDBBackupSpec{ | |||
| Type: cr.Spec.BackupSource.Type, | |||
There was a problem hiding this comment.
From what I understand, adding this is mostly for consistency, right? Couldn't understand how we use it with this PR's changes.
There was a problem hiding this comment.
no, this is a bug fix. after incremental backup changes, physical restores using backup source was broken and this fixes it
gkech
previously approved these changes
Mar 27, 2025
hors
approved these changes
Mar 28, 2025
gkech
approved these changes
Mar 28, 2025
commit: e37af0d |
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.
CHANGE DESCRIPTION
Problem:
Short explanation of the problem.
Cause:
Short explanation of the root cause of the issue if applicable.
Solution:
Short explanation of the solution we are providing with this PR.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability