bot incorrectly adding 'dont-land-on-v7.x'

[mscdex]

The bot continually adds 'dont-land-on-v7.x' even though the PR (should) lands cleanly. This has been going on for awhile now and I've had to manually remove the label in those cases.

[phillipj]

Got any example PRs by any chance? I could query the logs if it's a quite recent PR.

Noticed you removed it from nodejs/node#6601, but that seems correct cause those changes didn't land cleanly on the v7.x-staging branch when a tried on my machine a week or two ago.

[mscdex]

For example: nodejs/node#10980

or any of the recently merged test PRs (e.g. nodejs/node#10923) which should have no problem.

[MylesBorins]

tbqh I think we should consider dropping that auto label. incorrectly labeling don't land is potentially a big problem.

…

On Tue, Jan 24, 2017, 2:24 PM Brian White ***@***.***> wrote: For example: nodejs/node#10980 <nodejs/node#10980> or any of the recently merged test PRs (e.g. nodejs/node#10923 <nodejs/node#10923>) which should have no problem. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#116 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAecV9ZF_bqvkI0sMdG6r4m9DYRCznEiks5rVnoEgaJpZM4LsmbV> .

[mscdex]

/cc @Fishrock123

[mscdex]

Another example is this one: nodejs/node#10927

This one does actually have conflicts, but not any that were not automatically resolvable (no conflicting hunks). I'm thinking the bot maybe isn't set up correctly to do these safe automatic conflict resolutions?

[phillipj]

Logs related to ^ (10927):

06:42:51.985Z  INFO bot: Emitting GitHub event (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
06:42:51.986Z DEBUG bot: processing a new backport to v7 (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
06:42:51.986Z DEBUG bot: aborting any previous backport attempt... (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
06:42:52.281Z DEBUG bot: updating git remotes... (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
06:42:52.294Z DEBUG bot: (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
    Fetching origin
    
06:42:52.764Z DEBUG bot: checking out origin/v7.x-staging... (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
06:42:54.098Z DEBUG bot: (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
    Previous HEAD position was f5c57c73c5... test: cleanup stream tests
    
06:42:54.099Z DEBUG bot: (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
    HEAD is now at aa6b9f979e... deps: cherry-pick baba152 from V8 upstream
    
06:42:54.155Z DEBUG bot: fetching diff from pr 10927... (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
06:42:54.156Z DEBUG bot: attempting a backport to v7... (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
06:42:54.527Z DEBUG bot: (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
    error: patch failed: lib/buffer.js:2
    
06:42:54.527Z DEBUG bot: (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
    error: lib/buffer.js: patch does not apply
    
06:42:54.527Z DEBUG bot: (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
    Applying: buffer: improve compare() performance
    Patch failed at 0001 buffer: improve compare() performance
    The copy of the patch that failed is found in: .git/rebase-apply/patch
    When you have resolved this problem, run "git am --continue".
    If you prefer to skip this patch, run "git am --skip" instead.
    To restore the original branch and stop patching, run "git am --abort".
    
06:42:54.528Z DEBUG bot: backport to 7 failed (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)
06:42:54.529Z DEBUG bot: Resolved labels: dont-land-on-v7.x (req_id=2dabd94d-92c5-49a7-86a4-152ac4bfdc26, pr=nodejs/node/#10927, action=pull_request.synchronize)

[phillipj]

Logs related to 10980 looks weird:

17:57:40.092Z DEBUG bot: processing a new backport to v7 (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:40.093Z DEBUG bot: aborting any previous backport attempt... (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:40.417Z DEBUG bot: updating git remotes... (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:40.432Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    Fetching origin
    
17:57:40.919Z DEBUG bot: checking out origin/v7.x-staging... (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:42.100Z DEBUG bot: Fetching PR files for labelling (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:42.287Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    Previous HEAD position was f5c57c73c5... test: cleanup stream tests
    
17:57:42.288Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    HEAD is now at aa6b9f979e... deps: cherry-pick baba152 from V8 upstream
    
17:57:42.350Z DEBUG bot: fetching diff from pr 10980... (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:42.351Z DEBUG bot: attempting a backport to v7... (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.149Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    .git/rebase-apply/patch:6498: trailing whitespace.
    ;    IPos cur_match);                             // current match 
    
17:57:43.150Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    .git/rebase-apply/patch:6794: trailing whitespace.
    
    
17:57:43.150Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    .git/rebase-apply/patch:6795: trailing whitespace.
    
    
17:57:43.150Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    .git/rebase-apply/patch:6796: trailing whitespace.
    
    
17:57:43.150Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    .git/rebase-apply/patch:6803: trailing whitespace.
    
    
17:57:43.162Z DEBUG bot: e (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.162Z DEBUG bot: rror:  (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.162Z DEBUG bot: p (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.162Z DEBUG bot: atch failed:  (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.162Z DEBUG bot: d (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.162Z DEBUG bot: eps/zlib/contrib/minizip/ChangeLogUnzip (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.162Z DEBUG bot: : (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.163Z DEBUG bot: 1 (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.163Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    
    
17:57:43.163Z DEBUG bot: e (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.163Z DEBUG bot: rror:  (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.163Z DEBUG bot: d (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.163Z DEBUG bot: eps/zlib/contrib/minizip/ChangeLogUnzip (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.163Z DEBUG bot: : (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.163Z DEBUG bot:  patch does not apply (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.164Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    
    
17:57:43.178Z DEBUG bot: (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
    Applying: deps: upgrade zlib to 1.2.11
    Patch failed at 0001 deps: upgrade zlib to 1.2.11
    The copy of the patch that failed is found in: .git/rebase-apply/patch
    When you have resolved this problem, run "git am --continue".
    If you prefer to skip this patch, run "git am --skip" instead.
    To restore the original branch and stop patching, run "git am --abort".
    
17:57:43.180Z DEBUG bot: backport to 7 failed (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)
17:57:43.180Z DEBUG bot: Resolved labels: dont-land-on-v7.x (req_id=be04f999-798d-43f7-bad2-ae01a13b2820, pr=nodejs/node/#10980, action=pull_request.opened)

@MylesBorins said:
tbqh I think we should consider dropping that auto label. incorrectly
labeling don't land is potentially a big problem.

Totally understandable. It's trivial to disable the actual labelling, tho still perform the backport attempts for debugging what causes these issues.. I'd let @Fishrock123 decide when/what to do.

@mscdex would you say any backporting attempt labels are buggy, or mainly dont-land-on-v7.x?

[mscdex]

@phillipj Right, but there are no conflicting hunks, so an automatic resolution should be possible. For example, for that particular PR I merged with git am -3 and when I then ran git mergetool, meld showed no conflicting hunks so all I had to do was save the file and --continue.

[mscdex]

@phillipj I don't know about the other labels, but definitely dont-land-on-v7.x. I would think though since the process is the same for all branches, it's probably the same issue for all the labels.

[phillipj]

@mscdex ahh good catch, looking at ./scripts/attempt-backport.js#L217 it seems we're not passing the -3 arg.

[sam-github]

I agree with @MylesBorins about #116 (comment)

We should distinguish the auto-labels and the human labels (assuming the auto labels can actually be fixed).

The auto-label should be something like does-not-land, or auto-merge-to-v7.x-failed, so it clearly describes what the issue is, and the PR submitter can try to fix.

An opinion on dont-land should be reserved for humans to make.

[sam-github]

It gets re-added incorrectly to nodejs/node#10980 on every rebase, so if you are looking for a repro, its easy.

[mscdex]

I've always been a proponent of having separate labels for intention vs. technically landable without human intervention.

[phillipj]

Interesting discussion, personally not too opinionated as long as the devs using these labels to filter/exclude commits to land on staging branches is happy.

Fixing auto labels is needed anyway. I opened #117 enabling 3-way merge which will hopefully increase the number of PRs landing cleanly, and thereby not adding invalid auto labels.