Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backup: don't ignore uploadHost error #3731

Merged
merged 5 commits into from
Feb 28, 2024
Merged

Backup: don't ignore uploadHost error #3731

merged 5 commits into from
Feb 28, 2024

Conversation

Michal-Leszczynski
Copy link
Collaborator

@Michal-Leszczynski Michal-Leszczynski commented Feb 26, 2024 •
edited
Loading

Fixes #3729
Fixes #3733

@Michal-Leszczynski
Copy link
Collaborator Author

I will try to add tests later today.

@Michal-Leszczynski
Copy link
Collaborator Author

This should be included in the 3.2.6 release.

@karol-kokoszka
Copy link
Collaborator

Please add the test and change the PR from draft to regular one.
I'll include it into 3.2.6 then.

@Michal-Leszczynski Michal-Leszczynski marked this pull request as ready for review February 26, 2024 17:53
@Michal-Leszczynski
Copy link
Collaborator Author

Michal-Leszczynski commented Feb 26, 2024 •
edited
Loading

@karol-kokoszka I added a test and it turns out that it detected another, not connected issue #3733.
When commenting out validation mentioned in this issue, this test failed before fa7dccf and passes after it (but it always fails when the validation is left as it is).

I will tackle the other issue later into the week.

karol-kokoszka
karol-kokoszka approved these changes Feb 27, 2024
View reviewed changes
Copy link
Collaborator

@karol-kokoszka karol-kokoszka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit (it's about test code).
Other than that 👍

pkg/service/backup/service_backup_integration_test.go Outdated Show resolved Hide resolved
pkg/service/backup/worker_snapshot.go Outdated Show resolved Hide resolved
@Michal-Leszczynski
Copy link
Collaborator Author

@karol-kokoszka I decided to add a fix for failing tests in this PR. I also adressed the // nolint: dupl comment. Could you take a look at this PR one more time?

karol-kokoszka
karol-kokoszka approved these changes Feb 28, 2024
View reviewed changes
Copy link
Collaborator

@karol-kokoszka karol-kokoszka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@Michal-Leszczynski Michal-Leszczynski merged commit 998a50a into master Feb 28, 2024
19 of 21 checks passed
@Michal-Leszczynski Michal-Leszczynski deleted the ml/fix-upload-host-error branch February 28, 2024 15:59
@karol-kokoszka karol-kokoszka mentioned this pull request Mar 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@karol-kokoszka karol-kokoszka karol-kokoszka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Backup: don't fail when there are no snapshot dirs SM ignores backup uploadHost error
2 participants
@Michal-Leszczynski @karol-kokoszka