fix(devbox): add lvm timeout #20
Merged
Conversation
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
Zllinc
force-pushed
the
fix-lvm
branch
2 times, most recently
from
9653ea1 to
e80bcda
Compare
Signed-off-by: Zllinc <2965202581@qq.com>
zijiren233
reviewed
Dec 25, 2025
snapshots/devbox/lvm/lvm.go
Outdated
Comment on lines
296
to
302
| done := make(chan error, 1) | ||
| go func() { | ||
| done <- cmd.Wait() | ||
| }() | ||
|
|
||
| select { | ||
| case err := <-done: |
Member
There was a problem hiding this comment.
Here, we can directly use ctx to check for timeouts
snapshots/devbox/lvm/lvm.go
Outdated
Comment on lines
320
to
330
| pgid, err := syscall.Getpgid(cmd.Process.Pid) | ||
| if err != nil { | ||
| klog.Warningf("lvm: failed to get process group ID for PID %d: %v", | ||
| cmd.Process.Pid, err) | ||
| // If we can't get process group, kill the process directly | ||
| cmd.Process.Signal(syscall.SIGTERM) | ||
| } else { | ||
| // Send SIGTERM to the entire process group (negative PID means process group) | ||
| if err := syscall.Kill(-pgid, syscall.SIGTERM); err != nil { | ||
| klog.Warningf("lvm: failed to send SIGTERM to process group %d: %v", pgid, err) | ||
| } |
Member
There was a problem hiding this comment.
cmd.Cancel = func() error {
fmt.Println("Sending SIGTERM...")
return cmd.Process.Signal(syscall.SIGTERM)
}
// Wait for 10 seconds for the process to exit gracefully; send SIGKILL after timeout
cmd.WaitDelay = 10 * time.SecondYou can use the command like this
zijiren233
reviewed
Dec 26, 2025
snapshots/devbox/lvm/lvm.go
Outdated
| klog.Warningf("lvm: command %s %v timed out, sending SIGTERM", command, args) | ||
|
|
||
| if cmd.Process != nil { | ||
| pgid, err := syscall.Getpgid(cmd.Process.Pid) |
Member
There was a problem hiding this comment.
pgid should equal Process.Pid
| // Wait delay to send SIGKILL to the process group | ||
| cmd.WaitDelay = CommandGraceTimeout | ||
|
|
||
| err := cmd.Run() |
Member
There was a problem hiding this comment.
need add this after cmd.Run
if err != nil && errors.Is(ctx.Err(), context.DeadlineExceeded) {
if cmd.Process != nil {
pgid := cmd.Process.Pid
syscall.Kill(-pgid, syscall.SIGKILL)
}
}
dinoallo
approved these changes
Dec 26, 2025
zijiren233
approved these changes
Dec 26, 2025
dinoallo
approved these changes
Dec 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.