Adds reaping capability to openshift.

pkg/cmd/infra/router/router.go

@@ -12,6 +12,7 @@ import (
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	"github.com/openshift/origin/pkg/router"
 	controllerfactory "github.com/openshift/origin/pkg/router/controller/factory"
+	"github.com/openshift/origin/pkg/util/proc"
 	"github.com/openshift/origin/pkg/version"
 	templateplugin "github.com/openshift/origin/plugins/router/template"
 )
@@ -82,6 +83,8 @@ func start(cfg *clientcmd.Config, plugin router.Plugin) error {
 		return err
 	}
 
+	proc.StartReaper()
+
 	factory := controllerfactory.RouterControllerFactory{kubeClient, osClient}
 	controller := factory.Create(plugin)
 	controller.Run()

pkg/util/proc/reaper.go

@@ -0,0 +1,41 @@
+// +build linux
+
+package proc
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/golang/glog"
+)
+
+// StartReaper starts a goroutine to reap processes if called from a process
+// that has pid 1.
+func StartReaper() {
+	if os.Getpid() == 1 {
+		glog.V(4).Infof("Launching reaper")
+		go func() {
+			sigs := make(chan os.Signal, 1)
+			signal.Notify(sigs, syscall.SIGCHLD)
+			for {
+				// Wait for a child to terminate
+				sig := <-sigs
+				glog.V(4).Infof("Signal received: %v", sig)
+				for {
+					// Reap processes
+					glog.V(4).Infof("Waiting to reap")
+					cpid, err := syscall.Wait4(-1, nil, 0, nil)
+
+					// Break out if there are no more processes to reap
+					if err == syscall.ECHILD {
+						glog.V(4).Infof("Received: %v", err)
+						break
+					}
+
+					glog.V(4).Infof("Reaped process with pid %d", cpid)
+				}
+			}
+		}()
+	}
+}

pkg/util/proc/reaper_unsupported.go

@@ -0,0 +1,8 @@
+// +build !linux
+
+package proc
+
+// StartReaper has no effect on non-linux platforms.
+// Support for other unices will be added.
+func StartReaper() {
+}