Closed Bug 1443377 Opened 6 years ago Closed 6 years ago

servo-backout-pr failed to run: assert filename.startswith('servo/') failed

Categories

(Developer Services :: Servo VCS Sync, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: glob, Assigned: glob)

Details

Attachments

(1 file)

there's a content mismatch in vcs-servo-sync, perhaps caused by a backout:

content mismatch between source (6e3a7ed55a38) and destination (28a1060ab283) in servo/Cargo.lock

Destination Repository:

Last overlaid revision:

changeset: 270e441c36496df303aaa7b8227e614832b7394d
user:      Bastien Orivel <eijebong@bananium.fr>
date:      Mon Mar 05 10:22:24 2018 -0500
summary:   servo: Merge #20201 - Bump some dependencies now that metadeps is out of the way ᕕ( ᐛ )ᕗ (from Eijebong:bump); r=nox

Revisions that require investigation:

changeset: b7bb0ef4ddaa6e385db3094619963a2b6015220f
user:      shindli <shindli@mozilla.com>
date:      Mon Mar 05 18:55:45 2018 +0200
summary:   Backed out 2 changesets (fd805c59ae56, 270e441c3649) for servo bustage on a CLOSED TREE
Summary: content mismatch in vcs-servo-sync → content mismatch in servo-vcs-sync
from irc:

10:20 AM <gps> anyway, i resolved this later issue by manually hacking the file recording the last examined revision
10:20 AM <gps> i'm pretty sure things are running fine now
10:20 AM <gps> at least we haven't seen any email alerts

morphing bug to track the servo-backout-pr failure.
Summary: content mismatch in servo-vcs-sync → servo-backout-pr failed to run: unrecognized argument
Mar 06 00:47:32 servo-vcs-sync.mozops.net systemd[1]: Starting Generate Servo PRs from Firefox backouts...
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: processing backout b7bb0ef4ddaa: Backed out 2 changesets (fd805c59ae56, 270e441c3649) for servo bustage on a CLOSED TREE
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to find merge id in #fd805c59ae56: No bug - Revendor rust dependencies
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: b7bb0ef4ddaa backing out 270e441c3649: https://github.com/servo/servo/pull/20201
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to create pull-request, retrying:
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: processing backout b7bb0ef4ddaa: Backed out 2 changesets (fd805c59ae56, 270e441c3649) for servo bustage on a CLOSED TREE
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to find merge id in #fd805c59ae56: No bug - Revendor rust dependencies
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: b7bb0ef4ddaa backing out 270e441c3649: https://github.com/servo/servo/pull/20201
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to create pull-request, retrying:
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: processing backout b7bb0ef4ddaa: Backed out 2 changesets (fd805c59ae56, 270e441c3649) for servo bustage on a CLOSED TREE
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to find merge id in #fd805c59ae56: No bug - Revendor rust dependencies
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: b7bb0ef4ddaa backing out 270e441c3649: https://github.com/servo/servo/pull/20201
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to create pull-request, retrying:
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: processing backout b7bb0ef4ddaa: Backed out 2 changesets (fd805c59ae56, 270e441c3649) for servo bustage on a CLOSED TREE
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to find merge id in #fd805c59ae56: No bug - Revendor rust dependencies
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: b7bb0ef4ddaa backing out 270e441c3649: https://github.com/servo/servo/pull/20201
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to create pull-request, retrying:
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: processing backout b7bb0ef4ddaa: Backed out 2 changesets (fd805c59ae56, 270e441c3649) for servo bustage on a CLOSED TREE
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: failed to find merge id in #fd805c59ae56: No bug - Revendor rust dependencies
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: b7bb0ef4ddaa backing out 270e441c3649: https://github.com/servo/servo/pull/20201
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: Traceback (most recent call last):
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: File "/home/servo-sync/venv/lib/python2.7/site-packages/mozvcssync/cli.py", line 320, in servo_backout_pr_cli
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: args.revision,
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: File "/home/servo-sync/venv/lib/python2.7/site-packages/mozvcssync/servo_backout.py", line 232, in backout_servo_pr
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: pull_request_author)
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: File "/home/servo-sync/venv/lib/python2.7/site-packages/mozvcssync/servo_backout.py", line 116, in _create_pr_from_backout
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: touched_files = _get_touched_files(hg_repo, commit.node)
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: File "/home/servo-sync/venv/lib/python2.7/site-packages/mozvcssync/servo_backout.py", line 93, in _get_touched_files
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: return map(strip_servo, hg_repo.rawcommand(args).split('\n'))
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: File "/home/servo-sync/venv/lib/python2.7/site-packages/mozvcssync/servo_backout.py", line 86, in strip_servo
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: assert filename.startswith('servo/')
Mar 06 00:47:35 servo-vcs-sync.mozops.net servo-backout-pr-cli[31387]: AssertionError
Summary: servo-backout-pr failed to run: unrecognized argument → servo-backout-pr failed to run: assert filename.startswith('servo/') failed
ahh..

servo-backout-pr executed:
> hg log -r b7bb0ef4ddaa -T '{join(files,"\n")}' -I 'path:servo/'

this returns all files from revisions that touched servo/, including non-servo changes.

i'll change the assert into a filter.
Assignee: nobody → glob
Comment on attachment 8957431 [details]
servo-backout-pr: fix handling of backouts that touch servo and non-servo files (bug 1443377)

https://reviewboard.mozilla.org/r/226358/#review232962
Attachment #8957431 - Flags: review?(gps) → review+
Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/cf3cd79666bf
servo-backout-pr: fix handling of backouts that touch servo and non-servo files r=gps
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: