Skip to content

pkg/networks/usernet: Use SIGINT instead of SIGKILL #4310

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 2 commits into from
Nov 6, 2025
+5 −2
Merged

pkg/networks/usernet: Use SIGINT instead of SIGKILL #4310

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf70f4d
pkg/networks/usernet: Use `SIGINT` instead of `SIGKILL`
norio-nomura Nov 6, 2025
a392c0d
pkg/networks/usernet: Add fallback to `SIGKILL`
norio-nomura Nov 6, 2025
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
7 changes: 5 additions & 2 deletions pkg/networks/usernet/recoincile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func Stop(ctx context.Context, name string) error {
return err
}

if err := osutil.SysKill(pid, osutil.SigKill); err != nil {
if err := osutil.SysKill(pid, osutil.SigInt); err != nil {
Copy link
Member

@AkihiroSuda AkihiroSuda Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we fallback to SIGKILL on an error?

Copy link
Contributor Author

@norio-nomura norio-nomura Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error there should only occur when the signal cannot be sent.
Process monitoring is required to fall back to SIGKILL.
Should process monitoring be included?

Copy link
Member

@AkihiroSuda AkihiroSuda Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go func(){ Sleep(3 * second); SysKill(pid, SigKill) }() may suffice, unless the PID is reused for another process within the 3 seconds.

Copy link
Member

@AkihiroSuda AkihiroSuda Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me postpone this PR to v2.0.1 (or later)

logrus.Error(err)
return fmt.Errorf("failed to kill process with pid %d: %w", pid, err)
}
Expand All @@ -157,7 +157,10 @@ func Stop(ctx context.Context, name string) error {
break
}
if time.Since(startWaiting) > 5*time.Second {
logrus.Infof("usernet network still running after 5 seconds")
logrus.Infof("usernet network still running after 5 seconds. Attempting to forcibly kill")
if err := osutil.SysKill(pid, osutil.SigKill); err != nil {
logrus.Error(err)
}
break
}
time.Sleep(500 * time.Millisecond)
Expand Down
Loading