Merge pull request containerd#5738 from thaJeztah/simplify_cgroup_add

AkihiroSuda · web-flow · commit eaf7929320f4 · 2022-03-25T10:24:43.000+09:00
Use cgroups.AddProc() for cgroups v1
diff --git a/runtime/v1/shim/client/client_linux.go b/runtime/v1/shim/client/client_linux.go
@@ -35,9 +35,7 @@ func setCgroup(cgroupPath string, cmd *exec.Cmd) error {
 	if err != nil {
 		return fmt.Errorf("failed to load cgroup %s: %w", cgroupPath, err)
 	}
-	if err := cg.Add(cgroups.Process{
-		Pid: cmd.Process.Pid,
-	}); err != nil {
+	if err := cg.AddProc(uint64(cmd.Process.Pid)); err != nil {
 		return fmt.Errorf("failed to join cgroup %s: %w", cgroupPath, err)
 	}
 	return nil
diff --git a/runtime/v2/runc/manager/manager_linux.go b/runtime/v2/runc/manager/manager_linux.go
@@ -221,9 +221,7 @@ func (manager) Start(ctx context.Context, id string, opts shim.StartOpts) (_ str
 						if err != nil {
 							return "", fmt.Errorf("failed to load cgroup %s: %w", opts.ShimCgroup, err)
 						}
-						if err := cg.Add(cgroups.Process{
-							Pid: cmd.Process.Pid,
-						}); err != nil {
+						if err := cg.AddProc(uint64(cmd.Process.Pid)); err != nil {
 							return "", fmt.Errorf("failed to join cgroup %s: %w", opts.ShimCgroup, err)
 						}
 					}
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
@@ -207,9 +207,7 @@ func (s *service) StartShim(ctx context.Context, opts shim.StartOpts) (_ string,
 					if err != nil {
 						return "", fmt.Errorf("failed to load cgroup %s: %w", opts.ShimCgroup, err)
 					}
-					if err := cg.Add(cgroups.Process{
-						Pid: cmd.Process.Pid,
-					}); err != nil {
+					if err := cg.AddProc(uint64(cmd.Process.Pid)); err != nil {
 						return "", fmt.Errorf("failed to join cgroup %s: %w", opts.ShimCgroup, err)
 					}
 				}
diff --git a/services/server/server_linux.go b/services/server/server_linux.go
@@ -56,9 +56,7 @@ func apply(ctx context.Context, config *srvconfig.Config) error {
 					return err
 				}
 			}
-			if err := cg.Add(cgroups.Process{
-				Pid: os.Getpid(),
-			}); err != nil {
+			if err := cg.AddProc(uint64(os.Getpid())); err != nil {
 				return err
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ func setCgroup(cgroupPath string, cmd *exec.Cmd) error {`
`35`	`35`	`if err != nil {`
`36`	`36`	`return fmt.Errorf("failed to load cgroup %s: %w", cgroupPath, err)`
`37`	`37`	`}`
`38`		`- if err := cg.Add(cgroups.Process{`
`39`		`- Pid: cmd.Process.Pid,`
`40`		`- }); err != nil {`
	`38`	`+ if err := cg.AddProc(uint64(cmd.Process.Pid)); err != nil {`
`41`	`39`	`return fmt.Errorf("failed to join cgroup %s: %w", cgroupPath, err)`
`42`	`40`	`}`
`43`	`41`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -221,9 +221,7 @@ func (manager) Start(ctx context.Context, id string, opts shim.StartOpts) (_ str`
`221`	`221`	`if err != nil {`
`222`	`222`	`return "", fmt.Errorf("failed to load cgroup %s: %w", opts.ShimCgroup, err)`
`223`	`223`	`}`
`224`		`- if err := cg.Add(cgroups.Process{`
`225`		`- Pid: cmd.Process.Pid,`
`226`		`- }); err != nil {`
	`224`	`+ if err := cg.AddProc(uint64(cmd.Process.Pid)); err != nil {`
`227`	`225`	`return "", fmt.Errorf("failed to join cgroup %s: %w", opts.ShimCgroup, err)`
`228`	`226`	`}`
`229`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,9 +207,7 @@ func (s *service) StartShim(ctx context.Context, opts shim.StartOpts) (_ string,`
`207`	`207`	`if err != nil {`
`208`	`208`	`return "", fmt.Errorf("failed to load cgroup %s: %w", opts.ShimCgroup, err)`
`209`	`209`	`}`
`210`		`- if err := cg.Add(cgroups.Process{`
`211`		`- Pid: cmd.Process.Pid,`
`212`		`- }); err != nil {`
	`210`	`+ if err := cg.AddProc(uint64(cmd.Process.Pid)); err != nil {`
`213`	`211`	`return "", fmt.Errorf("failed to join cgroup %s: %w", opts.ShimCgroup, err)`
`214`	`212`	`}`
`215`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,7 @@ func apply(ctx context.Context, config *srvconfig.Config) error {`
`56`	`56`	`return err`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`- if err := cg.Add(cgroups.Process{`
`60`		`- Pid: os.Getpid(),`
`61`		`- }); err != nil {`
	`59`	`+ if err := cg.AddProc(uint64(os.Getpid())); err != nil {`
`62`	`60`	`return err`
`63`	`61`	`}`
`64`	`62`	`}`