Merge pull request #481 from tosi3k/oom-regex-fix

k8s-ci-robot · web-flow · commit 2d53c0a2a6c0 · 2020-11-16T14:06:20.000-08:00
Adapt OOMKilling pattern to old and new Linux kernels
diff --git a/config/kernel-monitor-filelog.json b/config/kernel-monitor-filelog.json
@@ -20,7 +20,7 @@
 		{
 			"type": "temporary",
 			"reason": "OOMKilling",
-			"pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"
+			"pattern": "Killed process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"
 		},
 		{
 			"type": "temporary",
diff --git a/config/kernel-monitor.json b/config/kernel-monitor.json
@@ -21,7 +21,7 @@
 		{
 			"type": "temporary",
 			"reason": "OOMKilling",
-			"pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"
+			"pattern": "Killed process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"
 		},
 		{
 			"type": "temporary",

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`{`
`21`	`21`	`"type": "temporary",`
`22`	`22`	`"reason": "OOMKilling",`
`23`		`- "pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"`
	`23`	`+ "pattern": "Killed process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"`
`24`	`24`	`},`
`25`	`25`	`{`
`26`	`26`	`"type": "temporary",`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`{`
`22`	`22`	`"type": "temporary",`
`23`	`23`	`"reason": "OOMKilling",`
`24`		`- "pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"`
	`24`	`+ "pattern": "Killed process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"`
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`"type": "temporary",`