vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

server: remove reaper, let runc take care of reaping

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-12-14 12:15:20 +01:00
parent 4cb5af00f6
commit d2f6a4c0e2
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
3 changed files with 2 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oci/oci.go
View file

@ -17,8 +17,8 @@ import (
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/Sirupsen/logrus"
"github.com/kubernetes-incubator/cri-o/utils"
"github.com/containernetworking/cni/pkg/ns"
"github.com/kubernetes-incubator/cri-o/utils"
"golang.org/x/sys/unix"
"k8s.io/kubernetes/pkg/fields"
pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
@ -275,6 +275,7 @@ func (r *Runtime) StopContainer(c *Container) error {
if err != nil && err != syscall.ESRCH {
return fmt.Errorf("failed to kill process: %v", err)
}
break
}
// Check if the process is still around
err := unix.Kill(c.state.Pid, 0)