github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4918 from vmarmol/handle-crash

Browse Source 
Handle crash in per-pod thread and container killer.
This commit is contained in:
Dawn Chen 2015-02-27 16:54:37 -08:00
commit 0fec31a11e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/kubelet.go
View File

@ -974,6 +974,7 @@ func (kl *Kubelet) killContainersInPod(pod *api.BoundPod, dockerContainers docke
count++ count++
wg.Add(1) wg.Add(1)
go func() { go func() {
defer util.HandleCrash()
err := kl.killContainer(dockerContainer) err := kl.killContainer(dockerContainer)
if err != nil { if err != nil {
glog.Errorf("Failed to delete container: %v; Skipping pod %q", err, podFullName) glog.Errorf("Failed to delete container: %v; Skipping pod %q", err, podFullName)

6
pkg/kubelet/pod_workers.go
View File

@ -23,6 +23,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/types" "github.com/GoogleCloudPlatform/kubernetes/pkg/types"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog" "github.com/golang/glog"
) )
@ -104,7 +105,10 @@ func (p *podWorkers) UpdatePod(pod *api.BoundPod, updateComplete func()) {
// update of this pod is being processed are ignored. // update of this pod is being processed are ignored.
podUpdates = make(chan workUpdate, 1) podUpdates = make(chan workUpdate, 1)
p.podUpdates[uid] = podUpdates p.podUpdates[uid] = podUpdates
go p.managePodLoop(podUpdates) go func() {
defer util.HandleCrash()
p.managePodLoop(podUpdates)
}()
} }
// TODO(wojtek-t): Consider changing to the following model: // TODO(wojtek-t): Consider changing to the following model:
// - add a cache of "desired" pod state // - add a cache of "desired" pod state