-
Notifications
You must be signed in to change notification settings - Fork 119
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
attempt-backport still does not work Edit: now working?! #100
Comments
also nodejs/node#10182 |
x_x It turns out it was failing because there was no git author set. The full output if anyone is that curious...
|
another: nodejs/node#10183 |
Ok. I think I got the git author/user set now... although probably not properly, but it works. Here's the logs from nodejs/node#9773, which appears to have been successful run and verified correct locally. (No labels should have been set.) Log snippit
|
do we have a list of all false negatives?
…On Thu, Dec 8, 2016, 11:41 AM Jeremiah Senkpiel ***@***.***> wrote:
Ok. I think I got the git author/user set now... although probably not
properly, but it works.
Here's the logs from nodejs/node#9773
<nodejs/node#9773>, which appears to have been
successful run and verified correct locally. (No labels should have been
set.)
Log snippit
14:35:39.436 DEBUG bot: resetting origin/v7.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:40.783 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at 778e5f7d0c test: fix error in test-cluster-worker-death.js
14:35:40.791 DEBUG bot: updating git remotes... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:40.812 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
Fetching origin
14:35:41.292 DEBUG bot: checking out origin/v7.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:41.726 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at 778e5f7d0c... test: fix error in test-cluster-worker-death.js
14:35:41.729 DEBUG bot: resetting origin/v7.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:41.883 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at 778e5f7d0c test: fix error in test-cluster-worker-death.js
14:35:41.886 DEBUG bot: fetching diff from pr 9773... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:41.887 DEBUG bot: attempting a backport to v7... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:42.226 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
Applying: Debugger - Filter out the ending of the Module wrapper when using the list command
14:35:42.229 DEBUG bot: backport to v7 successful (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:42.229 DEBUG bot: processing a new backport to v6 (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:42.229 DEBUG bot: aborting any previous backport attempt... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:42.270 DEBUG bot: resetting origin/v6.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:43.244 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at fb525f1507 test: fix error in test-cluster-worker-death.js
14:35:43.252 DEBUG bot: updating git remotes... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:43.272 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
Fetching origin
14:35:43.747 DEBUG bot: checking out origin/v6.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:43.970 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at fb525f1507... test: fix error in test-cluster-worker-death.js
14:35:43.973 DEBUG bot: resetting origin/v6.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:44.226 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at fb525f1507 test: fix error in test-cluster-worker-death.js
14:35:44.229 DEBUG bot: fetching diff from pr 9773... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:44.229 DEBUG bot: attempting a backport to v6... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:44.478 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
error: patch failed: lib/_debugger.js:1105
14:35:44.478 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
error: lib/_debugger.js: patch does not apply
14:35:44.479 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
Applying: Debugger - Filter out the ending of the Module wrapper when using the list command
Patch failed at 0001 Debugger - Filter out the ending of the Module wrapper when using the list command
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".
14:35:44.480 DEBUG bot: backport to 6 failed (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:44.480 DEBUG bot: processing a new backport to v4 (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:44.480 DEBUG bot: aborting any previous backport attempt... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:44.862 DEBUG bot: resetting origin/v4.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:45.837 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at cc36a63205 test: remove watchdog in test-debug-signal-cluster
14:35:45.844 DEBUG bot: updating git remotes... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:45.860 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
Fetching origin
14:35:46.337 DEBUG bot: checking out origin/v4.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:46.728 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at cc36a63205... test: remove watchdog in test-debug-signal-cluster
14:35:46.733 DEBUG bot: resetting origin/v4.x-staging... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:46.858 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
HEAD is now at cc36a63205 test: remove watchdog in test-debug-signal-cluster
14:35:46.863 DEBUG bot: fetching diff from pr 9773... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:46.863 DEBUG bot: attempting a backport to v4... (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
14:35:47.072 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
error: patch failed: lib/_debugger.js:1105
14:35:47.073 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
error: lib/_debugger.js: patch does not apply
14:35:47.073 DEBUG bot: (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
Applying: Debugger - Filter out the ending of the Module wrapper when using the list command
Patch failed at 0001 Debugger - Filter out the ending of the Module wrapper when using the list command
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".
14:35:47.074 DEBUG bot: backport to 4 failed (req_id=d4d9571c-622c-44bd-81fa-39c4008257b6, pr=nodejs/node/#9773, action=pull_request.synchronize)
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#100 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAecVzltsAFAgKF2jZu1mgl7FgUVpCiVks5rGF10gaJpZM4LIEE6>
.
|
I already cleaned them up. They would only ever have been the |
The bot keeps adding labels that are already present and it can be a bit noisy if there are many pushes: nodejs/node#9283 |
Perhaps we can do a diff against current labels and only update if there is a change. The check is good, as it may be possible between pushes for something to no longer land cleanly, and that would be a good thing to find out |
Sounds good. Such a change would probably be in lib/node-repo.js#updatePrWithLabels() if anyone wants to give it a shot. |
I started on this yesterday but haven't gotten to it yet this weekend. It has some nuance in that it would probably be best to also have it check if it previously labeled what would now be incorrect and removed previous labels it applied. Again, started on it but... |
Ok uh, the bot stopped working properly after about two days...? e.g. nodejs/node#10227 applies fine for me. Whenever it starts adding lots of |
It's not fully borked, this got labeled a few hours ago: nodejs/node#9916 |
So strange. nodejs/node#9931 applies cleanly on all branches but was during the window when something went wrong... |
Using this script to check things manually: git am --abort
# git remote update -p
git checkout v$1.x-staging
git clean -fd
git reset upstream/v$1.x-staging --hard
curl -L https://github.com/nodejs/node/pull/$2.patch | git am
CODE=$?
git am --abort
git reset upstream/v$1.x-staging --hard
exit $CODE |
Here's a different one... nodejs/node#10159 4 days ago (during the timeframe?) labeled as backport to v4 even though inspector doesn't even exist on v4. |
UH OH. Problem is occurring again. This time I have logs on and this is showing up:
Digging though the logs more to try to find what started it. |
Ok I think it started here:
Looks like there is a bug where parallel access to the git repo can occur. :/ |
Of note:
Perhaps there is a bug where that queuing logic does not work correctly if a second request comes in at certain stages during an existing request. |
Also worth mentioning for others not knowing the deployment details; there's only one bot process running. |
Here is another one: nodejs/node#10156 . 20h ago was the last time it added the |
Ok. I've also realized that this step is incorrect. It should be resetting to whatever the branch was, not the branch we want to switch to. The options are:
|
But I don't think the above should fail in that way or cause this? The logs do point to it though...? :/ |
- Resetting *before* checkout is probably actually faulty logic as described in nodejs#100 (comment) - Resetting after checkout is unnecessary because we check out the origin/ branch so the HEAD becomes detached.
#107 might fix the overarching issue. (maybe. (?)) It does remove the (almost certainly) unnecessary step(s) I just described though. |
- Resetting *before* checkout is probably actually faulty logic as described in nodejs#100 (comment) - Resetting after checkout is unnecessary because we check out the origin/ branch so the HEAD becomes detached. PR-URL: nodejs#107
I think #107 fixed it since no-one has yelled my way in the past 3 weeks lol |
Might look like there's still something fishy. I just rebased nodejs/node#6601 against master and it got labeled with
That patch lands cleanly on master for me :/ |
^ doh nevermind. Forgot master !== v7. I get the same issues as seen in the logs when trying to land patch on |
@rvagg had updated the git version to see if that was the issue was just an old git version.
I added an extra cleanup step and tested things thoroughly locally... All still worked.
nodejs/node#10181 is an example of it failing.
It lands cleanly all the way to v4, but the bot thought it was
dont-land-on-v7.x
.Here's some bot output:
relevant bot logs
... deploying some extra debugging live now ...
The text was updated successfully, but these errors were encountered: