Skip to content

Commit c1a613b

Browse files
committed
libpod/oci_conmon_linux: Remove AddPid call
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent d745036 commit c1a613b

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

libpod/oci_conmon_linux.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/containers/podman/v6/pkg/rootless"
1818
runcconfig "github.com/opencontainers/cgroups"
1919
devices "github.com/opencontainers/cgroups/devices/config"
20-
fs2 "github.com/opencontainers/cgroups/fs2"
2120
spec "github.com/opencontainers/runtime-spec/specs-go"
2221
"github.com/opencontainers/selinux/go-selinux"
2322
"github.com/sirupsen/logrus"
@@ -220,10 +219,6 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec
220219
_, err := cgroups.New(cgroupPath, &cgroupResources)
221220
if err != nil {
222221
logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)
223-
} else if err := fs2.AddPid(cmd.Process.Pid); err != nil {
224-
// we need to remove this defer and delete the cgroup once conmon exits
225-
// maybe need a conmon monitor?
226-
logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)
227222
}
228223
}
229224
}

0 commit comments

Comments
 (0)