pkg/networks/usernet: Add fallback to SIGKILL

norio-nomura · norio-nomura · commit a392c0d83fe9 · 2025-11-06T18:51:07.000+09:00
Signed-off-by: Norio Nomura &lt;norio.nomura@gmail.com&gt;
diff --git a/pkg/networks/usernet/recoincile.go b/pkg/networks/usernet/recoincile.go
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,10 @@ func Stop(ctx context.Context, name string) error {`
`157`	`157`	`break`
`158`	`158`	`}`
`159`	`159`	`if time.Since(startWaiting) > 5*time.Second {`
`160`		`- logrus.Infof("usernet network still running after 5 seconds")`
	`160`	`+ logrus.Infof("usernet network still running after 5 seconds. Attempting to forcibly kill")`
	`161`	`+ if err := osutil.SysKill(pid, osutil.SigKill); err != nil {`
	`162`	`+ logrus.Error(err)`
	`163`	`+ }`
`161`	`164`	`break`
`162`	`165`	`}`
`163`	`166`	`time.Sleep(500 * time.Millisecond)`