Enable CSI support for micro-vm #840
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| //go:build linux | ||
|
|
||
| // Copyright 2026 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
|
|
||
| "github.com/agent-substrate/substrate/cmd/ateom-microvm/internal/kata" | ||
| "github.com/agent-substrate/substrate/internal/ateompath" | ||
| "github.com/agent-substrate/substrate/internal/proto/ateompb" | ||
| specs "github.com/opencontainers/runtime-spec/specs-go" | ||
| ) | ||
|
|
||
| // hasCsiVolumes reports whether any container mounts a CSI volume. | ||
| func hasCsiVolumes(containers []*ateompb.Container) bool { | ||
|
hajiler marked this conversation as resolved.
|
||
| for _, c := range containers { | ||
| if len(c.GetCsiVolumeMounts()) > 0 { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| // csiMounts returns the OCI mounts that expose a container's CSI | ||
| // volumes at the paths it declared. Each source is that volume's directory | ||
| // inside the guest's CSI share, which the agent mounts at sandbox creation. | ||
| func csiMounts(mounts []*ateompb.VolumeMount) []specs.Mount { | ||
| out := make([]specs.Mount, 0, len(mounts)) | ||
| for _, m := range mounts { | ||
| out = append(out, specs.Mount{ | ||
| Destination: m.GetMountPath(), | ||
| Source: kata.GuestCsiVolumeDir(m.GetVolumeName()), | ||
| Type: "bind", | ||
| Options: []string{"rbind", "rw"}, | ||
| }) | ||
| } | ||
| return out | ||
|
hajiler marked this conversation as resolved.
|
||
| } | ||
|
|
||
| func csiVirtiofsdLogPath(id string) string { | ||
| return filepath.Join(kata.VMDir(id), "virtiofsd-csi.log") | ||
| } | ||
|
hajiler marked this conversation as resolved.
|
||
|
|
||
| // stageCsiShare starts the virtiofsd serving the actor's CSI volumes. | ||
| func (s *AteomService) stageCsiShare(ctx context.Context, rr resolvedRuntime, actorUID string) (*exec.Cmd, error) { | ||
| shared := ateompath.VolumesDir(actorUID) | ||
| if _, err := os.Stat(shared); err != nil { | ||
| return nil, fmt.Errorf("while checking CSI volumes dir %q: %w", shared, err) | ||
| } | ||
| log, err := os.OpenFile(csiVirtiofsdLogPath(actorUID), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o600) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("while opening CSI virtiofsd log file: %w", err) | ||
| } | ||
| defer log.Close() | ||
| cmd, err := kata.StartVirtiofsd(ctx, kata.VirtiofsdOptions{ | ||
| Binary: rr.virtiofsd, | ||
| SocketPath: kata.CsiVirtiofsdSocketPath(actorUID), | ||
| SharedDir: shared, | ||
| Cache: "auto", | ||
| Log: log, | ||
| }) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("while starting CSI virtiofsd: %w", err) | ||
| } | ||
| return cmd, nil | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently, we do not snapshot csi volumes since they are external and persisted beyond pause/suspend. So we are basically quitely ignoring Data snapshot config when only CSI volumes are present.
Instead should we either:
IMO maybe we just add a note to the the Data snapshot scope that it is particular to durable dir, and external volumes will not be snapshotted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that's correct for now. Dmitry Berkovich (@dberkov) FYI.