Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 23
api: report the actual fork mode on Instance#419
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.
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
Open
mpuig
wants to merge
3
commits into
kernel:mainChoose a base branch
from
mpuig:feat/report-fork-mode
base:main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Uh oh!
There was an error while loading. Please reload this page.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -422,6 +422,24 @@ func (m *manager) forkSnapshot(ctx context.Context, snapshotID string, req ForkS | ||
| forkMeta := cloneStoredMetadataWithoutPendingStandbyCompression(rec.StoredMetadata) | ||
| forkMeta.Id = forkID | ||
| forkMeta.Name = req.Name | ||
| // Caller-supplied tags override the cloned source tags (request wins per | ||
| // key), so a fork can be re-identified rather than inherit the source's | ||
| // identity labels. Unrelated source tags are preserved. | ||
| if len(req.Tags) > 0 { | ||
| if forkMeta.Tags == nil { | ||
| forkMeta.Tags = make(map[string]string, len(req.Tags)) | ||
| } | ||
| for k, v := range req.Tags { | ||
| forkMeta.Tags[k] = v | ||
| } | ||
| } | ||
cursor[bot] marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| // Record the measured fork mode, mirroring the instance-fork path: a shared | ||
| // mem-file is copy-on-write, anything else is a full copy. | ||
| if shareMemFile { | ||
| forkMeta.ForkMode = ForkModeShared | ||
| } else { | ||
| forkMeta.ForkMode = ForkModeCopied | ||
| } | ||
cursor[bot] marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| forkMeta.CreatedAt = now | ||
| forkMeta.ExpiresAt = nil | ||
| forkMeta.StartedAt = nil | ||
| @@ -589,6 +607,12 @@ func validateForkSnapshotRequest(req ForkSnapshotRequest) error { | ||
| if req.TargetState != "" && req.TargetState != StateStopped && req.TargetState != StateStandby && req.TargetState != StateRunning { | ||
| return fmt.Errorf("%w: invalid target_state %q", ErrInvalidRequest, req.TargetState) | ||
| } | ||
| // Caller-supplied tags are written into instance metadata below, so they must | ||
| // clear the same validation as create-instance and create-snapshot — the | ||
| // OpenAPI layer does not guard this direct manager path. | ||
| if err := tags.Validate(req.Tags); err != nil { | ||
| return fmt.Errorf("%w: %v", ErrInvalidRequest, err) | ||
| } | ||
| return nil | ||
| } | ||
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
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
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.