restore: remove incremental_location from SQL read syntaxes #160416
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
Member
|
This change is |
kev-cao
force-pushed
the
restore/remove-inc-location
branch
2 times, most recently
from
91b23a2 to
8c9146a
Compare
This patch removes support for the `incremental_location` syntax from our read paths. Resolves: cockroachdb#159172 Release note (backwards-incompatible change): The `incremental_location` option has been removed from `SHOW BACKUP` and `RESTORE`.
This commit removes all logic relating to custom incremental locations from our RESTORE and SHOW paths. Resolves: cockroachdb#159172 Release note: None
kev-cao
force-pushed
the
restore/remove-inc-location
branch
from
8c9146a to
5525d6e
Compare
kev-cao
commented
Jan 6, 2026
| return nil, err | ||
| } | ||
|
|
||
| // Check we can read from this location, though we don't need the backups here. |
Contributor
Author
There was a problem hiding this comment.
Now that all incrementals are stored in the same location as the rest of the backups, this read-access check shouldn't be necessary.
Contributor
Author
|
TFTR! bors r=msbutler |
craig bot
pushed a commit
that referenced
this pull request
Jan 7, 2026
160408: rttanalysis: deflake pause/cancel job benchmark r=jeffswenson a=msbutler This patch changes the benchmark to pause/cancel jobs which are guaranteed to be pausable/cancellable. While here, I added rows to the job_progress and job_status tables. Fixes #157116 Release note: none 160416: restore: remove incremental_location from SQL read syntaxes r=msbutler a=kev-cao This patch removes support for the `incremental_location` syntax from our read paths. Resolves: #159172 Release note (backwards-incompatible change): The `incremental_location` option has been removed from `SHOW BACKUP` and `RESTORE`. 160589: sql: deflake TestAbortedTxnLocks r=rafiss a=rafiss 5a1c5a7 enabled multitenant testing for this test. One of the subtests is flaky on secondary tenants, so we skip it in that mode. fixes #160585 Release note: None Co-authored-by: Michael Butler <[email protected]> Co-authored-by: Kevin Cao <[email protected]> Co-authored-by: Rafi Shamim <[email protected]>
Contributor
|
This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried. |
Contributor
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This patch removes support for the
incremental_locationsyntax from our read paths.Resolves: #159172
Release note (backwards-incompatible change): The
incremental_locationoption has been removed fromSHOW BACKUPandRESTORE.