Skip to content
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.

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

change oom score adj for nydus daemon #404

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion misc/snapshotter/nydus-snapshotter.fusedev.service
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ ExecStart=/usr/local/bin/containerd-nydus-grpc --config /etc/nydus/config.toml
Restart=always
RestartSec=1
KillMode=process
OOMScoreAdjust=-999
OOMScoreAdjust=-1000
StandardOutput=journal
StandardError=journal
MemoryMax=2G

[Install]
WantedBy=multi-user.target
5 changes: 5 additions & 0 deletions pkg/manager/daemon_adaptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/containerd/nydus-snapshotter/pkg/errdefs"
"github.com/containerd/nydus-snapshotter/pkg/metrics/collector"
metrics "github.com/containerd/nydus-snapshotter/pkg/metrics/tool"
"github.com/containerd/nydus-snapshotter/pkg/utils/oom"
)

// Fork the nydusd daemon with the process PID decided
Expand All @@ -40,6 +41,10 @@ func (m *Manager) StartDaemon(d *daemon.Daemon) error {
defer d.Unlock()

d.States.ProcessID = cmd.Process.Pid
err = oom.ChangeDaemonOOMScoreAdj(d.States.ProcessID, -999)
Copy link
Member

Choose a reason for hiding this comment

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

Is it possible to make it work as a Daemon method?

if err != nil {
return errors.Wrapf(err, "change oom score adj for %d", cmd.Process.Pid)
}

// Profile nydusd daemon CPU usage during its startup.
if config.GetDaemonProfileCPUDuration() > 0 {
Expand Down
5 changes: 5 additions & 0 deletions pkg/system/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/containerd/nydus-snapshotter/pkg/filesystem"
"github.com/containerd/nydus-snapshotter/pkg/manager"
metrics "github.com/containerd/nydus-snapshotter/pkg/metrics/tool"
"github.com/containerd/nydus-snapshotter/pkg/utils/oom"
)

const (
Expand Down Expand Up @@ -326,6 +327,10 @@ func (sc *Controller) upgradeNydusDaemon(d *daemon.Daemon, c upgradeRequest) err
if err := cmd.Start(); err != nil {
return errors.Wrap(err, "start process")
}
err = oom.ChangeDaemonOOMScoreAdj(cmd.Process.Pid, -999)
if err != nil {
return errors.Wrapf(err, "change oom score adj for %d", cmd.Process.Pid)
}

if err := new.WaitUntilState(types.DaemonStateInit); err != nil {
return errors.Wrap(err, "wait until init state")
Expand Down
63 changes: 63 additions & 0 deletions pkg/utils/oom/oom.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
* Copyright (c) 2023. Nydus Developers. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*/

package oom

import (
"fmt"
"os"
"strconv"
"strings"

"github.com/pkg/errors"
)

var (
OOMScoreAdjMin = -1000
OOMScoreAdjMax = 1000
)

func ReadOOMScoreAdj(path string) (int, error) {
oomBuf, err := os.ReadFile(path)
if err != nil {
return 0, errors.Wrapf(err, "read file %s", path)
}

oom, err := strconv.Atoi(strings.ReplaceAll(string(oomBuf), "\n", ""))
if err != nil {
return 0, errors.Wrapf(err, "convert %s to integer", string(oomBuf))
}
return oom, nil
}

func WriteOOMScoreAdj(path string, oomScoreAdj int) error {
return os.WriteFile(path, []byte(fmt.Sprint(oomScoreAdj)), 0644)
}

// Change the oom_score_adj of target process if the oom_score_adj of
// current process is equal to OOM_SCORE_ADJ_MIN.
// If the target's oom_score_adj is already greater than OOM_SCORE_ADJ_MIN, skip it.
func ChangeDaemonOOMScoreAdj(pid, scodeAdj int) error {
currentOOMPath := "/proc/self/oom_score_adj"
currentOOM, err := ReadOOMScoreAdj(currentOOMPath)
if err != nil {
return errors.Wrapf(err, "read oom_score_adj file %s", currentOOMPath)
}
if currentOOM > OOMScoreAdjMin {
return nil
}

daemonOOMPath := fmt.Sprintf("/proc/%d/oom_score_adj", pid)
daemonOOM, err := ReadOOMScoreAdj(currentOOMPath)
if err != nil {
return errors.Wrapf(err, "read oom_score_adj file %s", daemonOOMPath)
}
if daemonOOM > OOMScoreAdjMin {
return nil
}

return WriteOOMScoreAdj(daemonOOMPath, scodeAdj)
}