Merge pull request #1706 from euank/unix-processes-are-not-words

oomparser: don't get stuck for certain processes
google · Aug 1, 2017 · 83dea17 · 83dea17
2 parents ee7e1dd + fe722c7
commit 83dea17
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/utils/oomparser/oomparser.go b/utils/oomparser/oomparser.go
@@ -32,7 +32,7 @@ import (
 
 var (
 	containerRegexp = regexp.MustCompile(`Task in (.*) killed as a result of limit of (.*)`)
-	lastLineRegexp  = regexp.MustCompile(`(^[A-Z][a-z]{2} .*[0-9]{1,2} [0-9]{1,2}:[0-9]{2}:[0-9]{2}) .* Killed process ([0-9]+) \(([\w]+)\)`)
+	lastLineRegexp  = regexp.MustCompile(`(^[A-Z][a-z]{2} .*[0-9]{1,2} [0-9]{1,2}:[0-9]{2}:[0-9]{2}) .* Killed process ([0-9]+) \((.+)\)`)
 	firstLineRegexp = regexp.MustCompile(`invoked oom-killer:`)
 )
 

diff --git a/utils/oomparser/oomparser_test.go b/utils/oomparser/oomparser_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const startLine = "Jan 21 22:01:49 localhost kernel: [62278.816267] ruby invoked oom-killer: gfp_mask=0x201da, order=0, oom_score_adj=0"
-const endLine = "Jan 21 22:01:49 localhost kernel: [62279.421192] Killed process 19667 (evilprogram2) total-vm:1460016kB, anon-rss:1414008kB, file-rss:4kB"
+const endLine = "Jan 21 22:01:49 localhost kernel: [62279.421192] Killed process 19667 (evil-program2) total-vm:1460016kB, anon-rss:1414008kB, file-rss:4kB"
 const containerLine = "Jan 26 14:10:07 kateknister0.mtv.corp.google.com kernel: [1814368.465205] Task in /mem2 killed as a result of limit of /mem3"
 const containerLogFile = "containerOomExampleLog.txt"
 const systemLogFile = "systemOomExampleLog.txt"
@@ -104,8 +104,8 @@ func TestGetProcessNamePid(t *testing.T) {
 	if !couldParseLine {
 		t.Errorf("good line fed to getProcessNamePid should return true but returned %v", couldParseLine)
 	}
-	if currentOomInstance.ProcessName != "evilprogram2" {
-		t.Errorf("getProcessNamePid should have set processName to evilprogram2, not %s", currentOomInstance.ProcessName)
+	if currentOomInstance.ProcessName != "evil-program2" {
+		t.Errorf("getProcessNamePid should have set processName to evil-program2, not %s", currentOomInstance.ProcessName)
 	}
 	if currentOomInstance.Pid != 19667 {
 		t.Errorf("getProcessNamePid should have set PID to 19667, not %d", currentOomInstance.Pid)
@@ -126,6 +126,17 @@ func TestCheckIfStartOfMessages(t *testing.T) {
 	}
 }
 
+func TestLastLineRegex(t *testing.T) {
+	processNames := []string{"foo", "python3.4", "foo-bar", "Plex Media Server", "x86_64-pc-linux-gnu-c++-5.4.0", "[", "()", `"with quotes"`}
+	for _, name := range processNames {
+		line := fmt.Sprintf("Jan 21 22:01:49 localhost kernel: [62279.421192] Killed process 1234 (%s) total-vm:1460016kB, anon-rss:1414008kB, file-rss:4kB", name)
+		oomInfo := &OomInstance{}
+		getProcessNamePid(line, oomInfo)
+		assert.Equal(t, 1234, oomInfo.Pid)
+		assert.Equal(t, name, oomInfo.ProcessName)
+	}
+}
+
 func TestStreamOomsContainer(t *testing.T) {
 	expectedContainerOomInstance := createExpectedContainerOomInstance(t)
 	helpTestStreamOoms(expectedContainerOomInstance, containerLogFile, t)