Bug 30634 – commit-queue will get stuck on patches if land-patches terminates unexpectedly

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Eric Seidel (no email)]

commit-queue will get stuck on patches if land-patches terminates unexpectedly

If "bugzilla-tool land-patches" exit's early, we just spin.  This is bad.  We really should record that failure on the bug and mark the patch cq- if land-patches exits unexpectedly.

[Eric Seidel (no email)]

Created attachment 41586 [details]
post unknown errors to the bug instead of spinning

[Eric Seidel (no email)]

Created attachment 41593 [details]
post unknown errors to the bug instead of spinning

[Eric Seidel (no email)]

bug 30084's patch is based on the same branch as this one, so currently this one needs to be landed first.  the commit-queue doesn't know how to deal with dependencies, so I guess I'll remove the cq? from the other one.

[Adam Barth]

Comment on attachment 41593 [details]
post unknown errors to the bug instead of spinning

I don't really like the exit code 2 business, but I don't see a better design.

[Eric Seidel (no email)]

Agreed.  It gets even more skanky with the whole re-exec nonsense.  But this seemed the cleanest way to indicate to the calling process that it should keep going.  I could have it exit(0) in --commit-queue mode instead, but that seemed more confusing.

[Eric Seidel (no email)]

Comment on attachment 41593 [details]
post unknown errors to the bug instead of spinning

I'm certainly open to other opinions.

[WebKit Commit Bot]

Comment on attachment 41593 [details]
post unknown errors to the bug instead of spinning

Rejecting patch 41593 from commit-queue.

Failed to run "['git', 'svn', 'dcommit']" exit_code: 1
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebKitTools/ChangeLog
	M	WebKitTools/Scripts/bugzilla-tool
A repository hook failed: MERGE request failed on '/repository/webkit/trunk': Commit blocked by pre-commit hook (exit code 1) with output:
svnlook: Can't write to stream: Broken pipe

    The following ChangeLog files contain OOPS:

        trunk/WebKitTools/ChangeLog

    Please don't ever say "OOPS" in a ChangeLog file.
 at /usr/local/libexec/git-core//git-svn line 469

[Eric Seidel (no email)]

Sigh.  Clearly I need to build a smarter commit queue.

[Eric Seidel (no email)]

Going to see if I can't fix svn-apply (And thus the commit-queue) first.

[Eric Seidel (no email)]

I've fixed svn-apply, but it is faster to just land this by hand.

[Eric Seidel (no email)]

Committed r50104: <http://trac.webkit.org/changeset/50104>