Merge pull request kubernetes#4918 from vmarmol/handle-crash

Handle crash in per-pod thread and container killer.
satnam6502 · Feb 28, 2015 · 0fec31a · 0fec31a
2 parents d68c738 + c7e7ecd
commit 0fec31a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
@@ -974,6 +974,7 @@ func (kl *Kubelet) killContainersInPod(pod *api.BoundPod, dockerContainers docke
 			count++
 			wg.Add(1)
 			go func() {
+				defer util.HandleCrash()
 				err := kl.killContainer(dockerContainer)
 				if err != nil {
 					glog.Errorf("Failed to delete container: %v; Skipping pod %q", err, podFullName)

diff --git a/pkg/kubelet/pod_workers.go b/pkg/kubelet/pod_workers.go
@@ -23,6 +23,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"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.
 		podUpdates = make(chan workUpdate, 1)
 		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:
 	// - add a cache of "desired" pod state