github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge 7cc3fb296c into 89a95f958e

Browse Source
This commit is contained in:
stffabi 2025-05-03 20:57:32 +00:00 committed by GitHub
commit 29bc81f2e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/init/cmd/service/cmd.go
View File

@ -7,6 +7,8 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"syscall"
"time"
"github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
@ -15,7 +17,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
func parseCmd(ctx context.Context, command string, args []string) (*log.Entry, string, string, string, string) { func parseCmd(ctx context.Context, command string, args []string, cFlags ...func(*flag.FlagSet)) (*log.Entry, string, string, string, string) {
invoked := filepath.Base(os.Args[0]) invoked := filepath.Base(os.Args[0])
flags := flag.NewFlagSet(command, flag.ExitOnError) flags := flag.NewFlagSet(command, flag.ExitOnError)
flags.Usage = func() { flags.Usage = func() {
@ -29,6 +31,10 @@ func parseCmd(ctx context.Context, command string, args []string) (*log.Entry, s
dumpSpec := flags.String("dump-spec", "", "Dump container spec to file before start") dumpSpec := flags.String("dump-spec", "", "Dump container spec to file before start")
for _, cFlag := range cFlags {
cFlag(flags)
}
if err := flags.Parse(args); err != nil { if err := flags.Parse(args); err != nil {
log.Fatal("Unable to parse args") log.Fatal("Unable to parse args")
} }
@ -50,10 +56,13 @@ func parseCmd(ctx context.Context, command string, args []string) (*log.Entry, s
} }
func stopCmd(ctx context.Context, args []string) { func stopCmd(ctx context.Context, args []string) {
log, service, sock, path, _ := parseCmd(ctx, "stop", args) timeout := 10
log, service, sock, path, _ := parseCmd(ctx, "stop", args, func(flags *flag.FlagSet) {
flags.IntVar(&timeout, "time", 10, "Seconds to wait for stop before killing the service")
})
log.Infof("Stopping service: %q", service) log.Infof("Stopping service: %q", service)
id, pid, msg, err := stop(ctx, service, sock, path) id, pid, msg, err := stop(ctx, service, sock, path, time.Duration(timeout)*time.Second)
if err != nil { if err != nil {
log.WithError(err).Fatal(msg) log.WithError(err).Fatal(msg)
} }
@ -99,7 +108,7 @@ func (c *logio) Close() error {
return nil return nil
} }
func stop(ctx context.Context, service, sock, basePath string) (string, uint32, string, error) { func stop(ctx context.Context, service, sock, basePath string, timeBeforeKill time.Duration) (string, uint32, string, error) {
path := filepath.Join(basePath, service) path := filepath.Join(basePath, service)
runtimeConfig := getRuntimeConfig(path) runtimeConfig := getRuntimeConfig(path)
@ -126,16 +135,37 @@ func stop(ctx context.Context, service, sock, basePath string) (string, uint32,
id := ctr.ID() id := ctr.ID()
pid := task.Pid() pid := task.Pid()
err = task.Kill(ctx, 9) err = task.Kill(ctx, syscall.SIGTERM)
if err != nil {
return "", 0, "sopping task", err
}
s, err := task.Wait(ctx)
if err != nil {
return "", 0, "waiting for task to exit", err
}
select {
case <-s:
case <-time.After(timeBeforeKill):
log.Infof("Task did not stop after timeout, killing it...")
err = task.Kill(ctx, syscall.SIGKILL)
if err != nil { if err != nil {
return "", 0, "killing task", err return "", 0, "killing task", err
} }
_, err = task.Wait(ctx) s, err = task.Wait(ctx)
if err != nil { if err != nil {
return "", 0, "waiting for task to exit", err return "", 0, "waiting for task to exit", err
} }
select {
case <-s:
case <-time.After(5 * time.Second):
return "", 0, "killed, but did not stop", fmt.Errorf("Timeout waiting")
}
}
_, err = task.Delete(ctx) _, err = task.Delete(ctx)
if err != nil { if err != nil {
return "", 0, "deleting task", err return "", 0, "deleting task", err