From 3190c1c53d6e2aab16a1f2b05fe9957ffceb0a60 Mon Sep 17 00:00:00 2001
From: Michael Taufen <mtaufen@google.com>
Date: Wed, 23 Aug 2017 09:14:52 -0700
Subject: [PATCH] Fix journalctl leak

This fixes the journalctl leak that occurs when a process that uses
cadvisor exits. See issues #1725 and
https://github.com/kubernetes/kubernetes/issues/34965.
---
 utils/oomparser/oomparser.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/utils/oomparser/oomparser.go b/utils/oomparser/oomparser.go
index ae277d26..e9e6041c 100644
--- a/utils/oomparser/oomparser.go
+++ b/utils/oomparser/oomparser.go
@@ -22,6 +22,7 @@ import (
 	"path"
 	"regexp"
 	"strconv"
+	"syscall"
 	"time"
 
 	"github.com/google/cadvisor/utils"
@@ -167,6 +168,9 @@ func (self *OomParser) StreamOoms(outStream chan *OomInstance) {
 
 func callJournalctl() (io.ReadCloser, error) {
 	cmd := exec.Command("journalctl", "-k", "-f")
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Pdeathsig: syscall.SIGKILL,
+	}
 	readcloser, err := cmd.StdoutPipe()
 	if err != nil {
 		return nil, err