mirror of
https://github.com/containerd/containerd.git
synced 2026-11-07 05:47:40 +00:00
Kazuyoshi Kato
f890c79fd4
This commit brings the resource leak fix below. https://github.com/containerd/cgroups/pull/212 - The original upgrade PR was #6498. I didn't cherry-pick the commit due to conflicts. - ErrCgroupDeleted check is removed since LoadManager won't return the error (see #5739) and the variable was removed in 1.0.3. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
72 lines
2.1 KiB
Go
72 lines
2.1 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package server
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
|
|
"github.com/containerd/cgroups"
|
|
cgroupsv2 "github.com/containerd/cgroups/v2"
|
|
"github.com/containerd/containerd/log"
|
|
srvconfig "github.com/containerd/containerd/services/server/config"
|
|
"github.com/containerd/containerd/sys"
|
|
"github.com/containerd/ttrpc"
|
|
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
)
|
|
|
|
// apply sets config settings on the server process
|
|
func apply(ctx context.Context, config *srvconfig.Config) error {
|
|
if config.OOMScore != 0 {
|
|
log.G(ctx).Debugf("changing OOM score to %d", config.OOMScore)
|
|
if err := sys.SetOOMScore(os.Getpid(), config.OOMScore); err != nil {
|
|
log.G(ctx).WithError(err).Errorf("failed to change OOM score to %d", config.OOMScore)
|
|
}
|
|
}
|
|
if config.Cgroup.Path != "" {
|
|
if cgroups.Mode() == cgroups.Unified {
|
|
cg, err := cgroupsv2.LoadManager("/sys/fs/cgroup", config.Cgroup.Path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := cg.AddProc(uint64(os.Getpid())); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
cg, err := cgroups.Load(cgroups.V1, cgroups.StaticPath(config.Cgroup.Path))
|
|
if err != nil {
|
|
if err != cgroups.ErrCgroupDeleted {
|
|
return err
|
|
}
|
|
if cg, err = cgroups.New(cgroups.V1, cgroups.StaticPath(config.Cgroup.Path), &specs.LinuxResources{}); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if err := cg.Add(cgroups.Process{
|
|
Pid: os.Getpid(),
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func newTTRPCServer() (*ttrpc.Server, error) {
|
|
return ttrpc.NewServer(ttrpc.WithServerHandshaker(ttrpc.UnixSocketRequireSameUser()))
|
|
}
|