Skip to content

drivers: improve error message when executor process crashes #27783

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

Open
tmchow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

drivers: improve error message when executor process crashes #27783

Show file tree
Hide file tree
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
18 changes: 11 additions & 7 deletions drivers/exec/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,14 +592,18 @@ func (d *Driver) handleWait(ctx context.Context, handle *taskHandle, ch chan *dr
var result *drivers.ExitResult
ps, err := handle.exec.Wait(ctx)
if err != nil {
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: error waiting on process: %v", err),
}
// if process state is nil, we've probably been killed, so return a reasonable
// exit state to the handlers
// if process state is nil, the executor process likely crashed or was
// killed (e.g. OOM). Wrap the raw RPC error with a clearer message.
if ps == nil {
result.ExitCode = -1
result.OOMKilled = false
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: the executor process terminated unexpectedly: %v", err),
ExitCode: -1,
OOMKilled: false,
}
} else {
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: error waiting on process: %v", err),
}
}
} else {
result = &drivers.ExitResult{
Expand Down
18 changes: 11 additions & 7 deletions drivers/java/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,14 +601,18 @@ func (d *Driver) handleWait(ctx context.Context, handle *taskHandle, ch chan *dr
var result *drivers.ExitResult
ps, err := handle.exec.Wait(ctx)
if err != nil {
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: error waiting on process: %v", err),
}
// if process state is nil, we've probably been killed, so return a reasonable
// exit state to the handlers
// if process state is nil, the executor process likely crashed or was
// killed (e.g. OOM). Wrap the raw RPC error with a clearer message.
if ps == nil {
result.ExitCode = -1
result.OOMKilled = false
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: the executor process terminated unexpectedly: %v", err),
ExitCode: -1,
OOMKilled: false,
}
} else {
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: error waiting on process: %v", err),
}
}
} else {
result = &drivers.ExitResult{
Expand Down
18 changes: 11 additions & 7 deletions drivers/qemu/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,14 +831,18 @@ func (d *Driver) handleWait(ctx context.Context, handle *taskHandle, ch chan *dr
var result *drivers.ExitResult
ps, err := handle.exec.Wait(ctx)
if err != nil {
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: error waiting on process: %v", err),
}
// if process state is nil, we've probably been killed, so return a reasonable
// exit state to the handlers
// if process state is nil, the executor process likely crashed or was
// killed (e.g. OOM). Wrap the raw RPC error with a clearer message.
if ps == nil {
result.ExitCode = -1
result.OOMKilled = false
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: the executor process terminated unexpectedly: %v", err),
ExitCode: -1,
OOMKilled: false,
}
} else {
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: error waiting on process: %v", err),
}
}
} else {
result = &drivers.ExitResult{
Expand Down
18 changes: 11 additions & 7 deletions drivers/rawexec/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,14 +498,18 @@ func (d *Driver) handleWait(ctx context.Context, handle *taskHandle, ch chan *dr
var result *drivers.ExitResult
ps, err := handle.exec.Wait(ctx)
if err != nil {
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: error waiting on process: %v", err),
}
// if process state is nil, we've probably been killed, so return a reasonable
// exit state to the handlers
// if process state is nil, the executor process likely crashed or was
// killed (e.g. OOM). Wrap the raw RPC error with a clearer message.
if ps == nil {
result.ExitCode = -1
result.OOMKilled = false
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: the executor process terminated unexpectedly: %v", err),
ExitCode: -1,
OOMKilled: false,
}
} else {
result = &drivers.ExitResult{
Err: fmt.Errorf("executor: error waiting on process: %v", err),
}
}
} else {
result = &drivers.ExitResult{
Expand Down