Last nits for native backup/restore release - #4788
Merged
Merged
Conversation
Michal-Leszczynski
force-pushed
the
ml/4728-adjust-s3-ose-parsing
branch
from
March 12, 2026 14:56
76b11a3 to
75058f5
Compare
There was a problem hiding this comment.
Pull request overview
This PR prepares the native backup/restore feature for release by enabling the native restore API support (>= 2026.1), updating the Scylla object storage endpoint configuration to use a new URL-based format (with legacy support), improving endpoint matching logic, and refreshing documentation.
Changes:
- Enables
SupportsNativeRestoreAPIfor Scylla >= 2026.1 (previously always returned false) and updates endpoint comparison to use a newfillDefaultSchemeAndPortnormalization function that supports both legacy and new URL-based endpoint formats. - Updates Scylla config and Makefile to use the new
object_storage_endpointsformat withtype: s3and full URL names instead of separateport/httpsfields. - Adds new
native-restore.rstdocumentation page and updates CLI help text for the--methodflag across restore commands.
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/scyllaclient/client_agent.go | Enables native restore for >= 2026.1, refactors endpoint matching with fillDefaultSchemeAndPort, adds legacy format support |
| pkg/scyllaclient/client_agent_test.go | Adds test cases for new URL-based endpoint matching (scheme, port, IPv6) |
| pkg/service/restore/restore_integration_test.go | Updates test to use ni.SupportsNativeRestoreAPI() and corrects MethodAuto expected path to native |
| testing/Makefile | Replaces MINIO_HOST with OBJECT_STORAGE_ENDPOINT using full URL |
| testing/scylla/config/scylla.yaml | Updates object_storage_endpoints to new type: s3 format |
| pkg/command/restore/res.yaml | Rewrites --method flag help text |
| docs/source/sctool/partials/sctool_restore.yaml | Updates --method usage docs |
| docs/source/sctool/partials/sctool_restore_update.yaml | Updates --method usage docs |
| docs/source/restore/native-restore.rst | New documentation page for native restore |
| docs/source/restore/index.rst | Adds native-restore to toctree |
| docs/source/backup/native-backup.rst | Updates native backup docs for GCS support and new endpoint format |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Michal-Leszczynski
force-pushed
the
ml/4728-adjust-s3-ose-parsing
branch
2 times, most recently
from
March 12, 2026 15:56
16782e7 to
d9e13cc
Compare
This commit makes it so both old and new s3 object storage formats are parsed and compared correctly. To do that, a new helper function fillDefaultSchemeAndPort was added which simplifies the default scheme and port handling by expanding provided endpoint with them. It's also used to make gs endpoint comparison more robust. Fixes #4728
Michal-Leszczynski
force-pushed
the
ml/4728-adjust-s3-ose-parsing
branch
2 times, most recently
from
March 12, 2026 16:08
bac591b to
c6fe87f
Compare
Michal-Leszczynski
force-pushed
the
ml/4728-adjust-s3-ose-parsing
branch
from
March 12, 2026 17:37
c6fe87f to
ef24308
Compare
Michal-Leszczynski
marked this pull request as ready for review
March 13, 2026 09:21
Michal-Leszczynski
requested review from
VAveryanov8 and
karol-kokoszka
as code owners
March 13, 2026 09:21
Collaborator
Author
|
Added small commit adding SM 3.9 to compatibility matrix. |
karol-kokoszka
approved these changes
Mar 13, 2026
This commit marks native restore as production ready for scylla 2026.1, meaning that --method=auto can start using it when other conditions are met. Additionally, this commit refactors TestRestoreTablesMethodIntegration so that it's easier to see what scenarios are validated. To have a better structure, TestRestoreTablesMethodIntegration and TestRestoreFullChangingMethodIntegration were moved to separate test file.
Michal-Leszczynski
force-pushed
the
ml/4728-adjust-s3-ose-parsing
branch
from
March 13, 2026 15:32
f69c560 to
2483fa6
Compare
karol-kokoszka
approved these changes
Mar 13, 2026
Native backup for gs is supported starting from scylla 2026.1, so we should reflect it in our docs. This commit also fixes broken link and ajdusts example s3 object storage endpoint to the new format.
This commit adds native restore page similar to the native backup one. It also adjusts --method flag description so that it points to the newly created page. Fixes #4606
Michal-Leszczynski
force-pushed
the
ml/4728-adjust-s3-ose-parsing
branch
from
March 13, 2026 15:57
2483fa6 to
12aa51a
Compare
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
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.
This PR adds the last missing parts for official support of:
Fixes #4588
Fixes #4728
Fixes #4606