|
@@ -11,9 +11,9 @@ import (
|
|
"time"
|
|
"time"
|
|
|
|
|
|
"github.com/codeskyblue/go-sh"
|
|
"github.com/codeskyblue/go-sh"
|
|
- "golang.org/x/sys/unix"
|
|
|
|
- "github.com/moby/moby/pkg/reexec"
|
|
|
|
cgv1 "github.com/containerd/cgroups"
|
|
cgv1 "github.com/containerd/cgroups"
|
|
|
|
+ "github.com/moby/moby/pkg/reexec"
|
|
|
|
+ "golang.org/x/sys/unix"
|
|
)
|
|
)
|
|
|
|
|
|
// runner is to run os commands giving command line, env and log file
|
|
// runner is to run os commands giving command line, env and log file
|
|
@@ -60,7 +60,7 @@ func newCmdJob(provider mirrorProvider, cmdAndArgs []string, workingDir string,
|
|
}
|
|
}
|
|
// set memlimit
|
|
// set memlimit
|
|
if d.memoryLimit != 0 {
|
|
if d.memoryLimit != 0 {
|
|
- args = append(args, "-m", fmt.Sprint(d.memoryLimit.Value()))
|
|
|
|
|
|
+ args = append(args, "-m", fmt.Sprint(d.memoryLimit.Value()))
|
|
}
|
|
}
|
|
// apply options
|
|
// apply options
|
|
args = append(args, d.options...)
|
|
args = append(args, d.options...)
|
|
@@ -115,7 +115,7 @@ func (c *cmdJob) Start() error {
|
|
if cg != nil {
|
|
if cg != nil {
|
|
logger.Debugf("Preparing cgroup sync pipes for job %s", c.provider.Name())
|
|
logger.Debugf("Preparing cgroup sync pipes for job %s", c.provider.Name())
|
|
var err error
|
|
var err error
|
|
- pipeR, pipeW, err = os.Pipe();
|
|
|
|
|
|
+ pipeR, pipeW, err = os.Pipe()
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
@@ -139,7 +139,7 @@ func (c *cmdJob) Start() error {
|
|
}
|
|
}
|
|
pid := c.cmd.Process.Pid
|
|
pid := c.cmd.Process.Pid
|
|
if cg.cgCfg.isUnified {
|
|
if cg.cgCfg.isUnified {
|
|
- if err := cg.cgMgrV2.AddProc(uint64(pid)); err != nil{
|
|
|
|
|
|
+ if err := cg.cgMgrV2.AddProc(uint64(pid)); err != nil {
|
|
if errors.Is(err, syscall.ESRCH) {
|
|
if errors.Is(err, syscall.ESRCH) {
|
|
logger.Infof("Write pid %d to cgroup failed: process vanished, ignoring")
|
|
logger.Infof("Write pid %d to cgroup failed: process vanished, ignoring")
|
|
} else {
|
|
} else {
|
|
@@ -147,7 +147,7 @@ func (c *cmdJob) Start() error {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- if err := cg.cgMgrV1.Add(cgv1.Process{Pid: pid}); err != nil{
|
|
|
|
|
|
+ if err := cg.cgMgrV1.Add(cgv1.Process{Pid: pid}); err != nil {
|
|
if errors.Is(err, syscall.ESRCH) {
|
|
if errors.Is(err, syscall.ESRCH) {
|
|
logger.Infof("Write pid %d to cgroup failed: process vanished, ignoring")
|
|
logger.Infof("Write pid %d to cgroup failed: process vanished, ignoring")
|
|
} else {
|
|
} else {
|