Improvements to Starnix VM handling #5334
Open
Conversation
This file contains 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 allows for multiple starnix VM pools to exist simultaneously without conflict, and avoids any unintential global state.
- Extraneous references to the `ffx log` pipe are closed, allowing the EOF from the subprocess to be propagated properly. - The SSH bridge into the Starnix sshd is now properly shut down when the instance is closed, avoiding a zombie process. - Some of the starnix code has been updated to be in line with a refactor that took place in other VM types.
They are very noisy and can cause important crash information to run off the end of the buffer; this is a temporary fix to avoid that.
6362cb7
to
d93d0f5
Compare
glpesk
reviewed
Sep 24, 2024
| if err != nil { | ||
| return nil, fmt.Errorf("failed to make ffx isolation dir: %w", err) | ||
| } | ||
| log.Logf(0, "initialized vm pool with ffx dir: %v", ffxDir) |
There was a problem hiding this comment.
Nit: how about putting this under an if env.Debug? (I do sometimes refer to this log string in order to run ffx log on the side, but it would be okay to have it only in debug mode.)
| @@ -137,6 +161,12 @@ func (pool *Pool) Create(workdir string, index int) (vmimpl.Instance, error) { | |||
| return inst, nil | |||
| } | |||
|
|
|||
| func (pool *Pool) Close() error { | |||
| log.Logf(0, "shutting down vm pool with tempdir %v...", pool.ffxDir) | |||
There was a problem hiding this comment.
Likewise, maybe print this only in debug mode.
| if err != nil { | ||
| return nil, err | ||
| } | ||
| inst.sshPrivKey = string(bytes.Trim(privkey, "\"\n")) | ||
|
|
||
| // Copy auto-detected product bundle path from in-tree ffx to isolated ffx. |
There was a problem hiding this comment.
Good idea, glad this worked!
| @@ -187,8 +215,9 @@ func (inst *instance) Close() error { | |||
| } | |||
|
|
|||
| func (inst *instance) startFuchsiaVM() error { | |||
| err := inst.ffx("emu", "start", "--headless", "--name", inst.name, "--net", "user") | |||
| if err != nil { | |||
| inst.runFfx(1*time.Minute, "config", "get", "product.path") | |||
There was a problem hiding this comment.
Nit: any reason the timeout is different from the same command in pool.Create()?
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.
No description provided.