793630 - Clean up GeneralErrorFilter.php matchLine() regexes & optimise order

Status: RESOLVED FIXED

(Tree Management Graveyard :: TBPL, defect)

Description

[Ed Morley [:emorley]]

The regex in GeneralErrorFilter.php contains unnecessary escaping of colons, omits '^' in cases where we could add it to improve performance and could be re-ordered in most to least likely, such that we don't check for half a dozen cases before 'TEST-UNEXPECTED-', which is our most frequent failure case. 

(Although given we search per line for each regex, rather than all lines using one regex and then onto the next; I guess the latter won't save us much other than for the rare 'thousands of TEST-UNEXPECTED-FAILs' case).

I can't seem to remember seeing instances covered by:
> || preg_match("/ error\([0-9]*\)\:/", $line) // . . . . . . . . . . . . C

...but am reluctant to remove it at present, in case I've just forgotten them.

Comment 1

[Ed Morley [:emorley]]

Attachment: Part 1: Cleanup regex

* Replaces \d\d? with \d+
* Removes unnecessary escaping before colons
* Adds start of line anchors to:
 ** 'Automation Error:'
 ** 'buildbot.slave.commands.TimeoutError:'
 ** 'PROCESS-CRASH'

Comment 2

[Ed Morley [:emorley]]

Attachment: Part 2: Reorder

* Puts the most common TEST-UNEXPECTED-(?:PASS|FAIL) case first.
* Groups the rest a bit more logically.

Comment 3

[Ed Morley [:emorley]]

Attachment: Part 2: Reorder (v2)

* Puts the more common TEST-INFO / TEST-UNEXPECTED-(?:PASS|FAIL) cases first.
* Groups the rest a bit more logically.

Comment 4

[Ed Morley [:emorley]]

Attachment: Part 1: Cleanup regex (v2)

Same as v1 except doesn't add the start of line anchor to "Automation Error:", since otherwise we won't match the format that will soon be output thanks to bug 793641.

Comment 5

[Ed Morley [:emorley]]

Comment on attachment 664158 [details] [diff] [review]
Part 1: Cleanup regex (v2)

Switching review requests around to distribute the load a bit more evenly.

Comment 6

[Ed Morley [:emorley]]

Comment on attachment 664005 [details] [diff] [review]
Part 2: Reorder (v2)

Switching review requests around to distribute the load a bit more evenly.

Comment 7

[Ed Morley [:emorley]]

Thank you for the reviews :-)

http://hg.mozilla.org/users/mstange_themasta.com/tinderboxpushlog/rev/bd7af0a69b00
http://hg.mozilla.org/users/mstange_themasta.com/tinderboxpushlog/rev/c74afc69a7db