Skip to content
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

use kill to terminate vm process after rpc protocol query #1051

Merged
merged 1 commit into from
Sep 21, 2023
Merged

use kill to terminate vm process after rpc protocol query #1051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions pkg/vm/compatibility.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"io"
"path/filepath"
"strconv"
"syscall"
"time"

pb "github.com/ava-labs/avalanchego/proto/pb/vm/runtime"
Expand Down Expand Up @@ -113,14 +112,10 @@ func GetVMBinaryProtocolVersion(vmPath string) (int, error) {
return 0, fmt.Errorf("timeout while waiting for vm protocol version: %w", runtime.ErrHandshakeFailed)
}

if err := cmd.Process.Signal(syscall.SIGTERM); err != nil {
// no need for a clean process termination
if err := cmd.Process.Kill(); err != nil {
_ = dumpProcessOutput(stdoutPipe, stderrPipe)
return 0, fmt.Errorf("failure signaling termination to vm: %w", err)
}

if err := cmd.Wait(); err != nil {
_ = dumpProcessOutput(stdoutPipe, stderrPipe)
return 0, fmt.Errorf("failure waiting for vm termination: %w", err)
return 0, fmt.Errorf("failure killing vm: %w", err)
}

return int(protocolVersion), nil
Expand Down