Skip to content

clh: isClhRunning waits for full timeout when clh exits #182

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 2, 2024
Merged

clh: isClhRunning waits for full timeout when clh exits #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
304d016
clh: initialize clh pid before using it
alex-matei Mar 6, 2024
5e0ec90
clh: isClhRunning waits for full timeout when clh exits
alex-matei Apr 8, 2024
9b43ba8
genpolicy: update sample
Redent0r Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/agent/samples/policy/yaml/deployment/deployment-docker-busybox.yaml
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 16 additions & 8 deletions src/runtime/virtcontainers/clh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,11 +760,10 @@ func (clh *cloudHypervisor) StartVM(ctx context.Context, timeout int) error {
}
}()

pid, err := clh.launchClh()
err = clh.launchClh()
if err != nil {
return fmt.Errorf("failed to launch cloud-hypervisor: %q", err)
}
clh.state.PID = pid

bootvm_timeout := clh.getClhAPITimeout()
// TODO: review this 10 second minimum timeout value.
Expand Down Expand Up @@ -1421,11 +1420,13 @@ func (clh *cloudHypervisor) clhPath() (string, error) {
return p, err
}

func (clh *cloudHypervisor) launchClh() (int, error) {
func (clh *cloudHypervisor) launchClh() error {

clh.state.PID = -1

clhPath, err := clh.clhPath()
if err != nil {
return -1, err
return err
}

args := []string{cscAPIsocket, clh.state.apiSocket}
Expand Down Expand Up @@ -1482,15 +1483,17 @@ func (clh *cloudHypervisor) launchClh() (int, error) {

err = utils.StartCmd(cmdHypervisor)
if err != nil {
return -1, err
return err
}

clh.state.PID = cmdHypervisor.Process.Pid

if err := clh.waitVMM(clhTimeout); err != nil {
clh.Logger().WithError(err).Warn("cloud-hypervisor init failed")
return -1, err
return err
}

return cmdHypervisor.Process.Pid, nil
return nil
}

//###########################################################################
Expand Down Expand Up @@ -1540,7 +1543,12 @@ func (clh *cloudHypervisor) isClhRunning(timeout uint) (bool, error) {
timeStart := time.Now()
cl := clh.client()
for {
err := syscall.Kill(pid, syscall.Signal(0))
waitedPid, err := syscall.Wait4(pid, nil, syscall.WNOHANG, nil)
if waitedPid == pid && err == nil {
return false, nil
}

err = syscall.Kill(pid, syscall.Signal(0))
if err != nil {
return false, nil
}
Expand Down