Skip to content
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

Closed
Fishrock123 opened this issue Dec 8, 2016 · 26 comments · Fixed by #104
Closed

attempt-backport still does not work Edit: now working?! #100

Fishrock123 opened this issue Dec 8, 2016 · 26 comments · Fixed by #104

Comments

@Fishrock123
Copy link
Contributor

@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
12:05:27.711 DEBUG bot: processing a new backport to v7 (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:27.711 DEBUG bot: aborting any previous backport attempt... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:27.716  INFO bot: request finish (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, duration=7, req.query={}, req.remoteAddress=::ffff:192.30.252.42, req.remotePort=61138)
    POST /hooks/github HTTP/1.1
    host: github-bot.nodejs.org:3333
    accept: */*
    user-agent: GitHub-Hookshot/4f5b94b
    x-github-event: pull_request
    x-github-delivery: 83fca580-bd68-11e6-9f8a-82fea636fda2
    content-type: application/json
    x-hub-signature: null
    content-length: 19641
    --
    HTTP/1.1 200 OK
    HTTP/1.1 200 OK
    X-Powered-By: Express
    X-Request-Id: ac0bc597-a8ed-410f-a253-8cfdbabd7324
    Date: Thu, 08 Dec 2016 17:05:27 GMT
    Connection: keep-alive
    Content-Length: 0
12:05:27.723 DEBUG bot: resetting origin/v7.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:29.565 DEBUG bot: updating git remotes... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:29.717 DEBUG bot: Fetching PR files for labelling (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:30.228 DEBUG bot: Filled existing repo labels cache: addons,aix,arm,assert,async_hooks,async_wrap,benchmark,blocked,buffer,build,c++,cares,child_process,cluster,code-and-learn,confirmed-bug,console,crypto,ctc-agenda,ctc-review,debugger,dgram,discuss,dns,doc,domain,dont-land-on-v4.x,dont-land-on-v6.x,dont-land-on-v7.x,duplicate,errors,events,feature request,freebsd,fs,good first contribution,help wanted,http,https,http_parser,in progress,install,intl,invalid,land-on-v4.x,land-on-v6.x,lib / src,libuv,lts,lts-agenda,lts-watch-v0.12,lts-watch-v4.x,lts-watch-v6.x,macos,memory,mentor-available,meta,mips,module,net,notable-change,npm,openssl,os,path,performance,post-mortem,ppc,process,promises,punycode,querystring,question,readline,repl,repro-exists,s390,security,semver-major,semver-minor,smartos,stalled,stream,string_decoder,test,timers,tls,tools,tty,url,util,v0.12,v4.x,v6.x,v7.x,V8,V8_inspector,vm,windows,wontfix,zlib (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:30.229 DEBUG bot: Resolved labels: test (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:30.229 DEBUG bot: Trying to add labels: test (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:30.419  INFO bot: Added labels: test (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:30.739  INFO bot: Emitting GitHub event (req_id=221df042-0235-488f-8560-df45d39d48f0, pr=nodejs/node/#10181, action=pull_request.labeled)
12:05:30.740  INFO bot: request finish (req_id=221df042-0235-488f-8560-df45d39d48f0, duration=2, req.query={}, req.remoteAddress=::ffff:192.30.252.40, req.remotePort=49977)
    POST /hooks/github HTTP/1.1
    host: github-bot.nodejs.org:3333
    accept: */*
    user-agent: GitHub-Hookshot/4f5b94b
    x-github-event: pull_request
    x-github-delivery: 85c66900-bd68-11e6-8e52-c3e7d940b701
    content-type: application/json
    x-hub-signature: null
    content-length: 19945
    --
    HTTP/1.1 200 OK
    HTTP/1.1 200 OK
    X-Powered-By: Express
    X-Request-Id: 221df042-0235-488f-8560-df45d39d48f0
    Date: Thu, 08 Dec 2016 17:05:30 GMT
    Connection: keep-alive
    Content-Length: 0
12:05:32.159 DEBUG bot: checking out origin/v7.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.557 DEBUG bot: resetting origin/v7.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.749 DEBUG bot: fetching diff from pr 10181... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.750 DEBUG bot: attempting a backport to v7... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.757 DEBUG bot: backport to 7 failed (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.757 DEBUG bot: Trying to add labels: dont-land-on-v7.x (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.764 DEBUG bot: processing a new backport to v6 (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.764 DEBUG bot: aborting any previous backport attempt... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.768 DEBUG bot: resetting origin/v6.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:32.943  INFO bot: Added labels: dont-land-on-v7.x (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:33.113  INFO bot: Emitting GitHub event (req_id=5d263e80-f80f-4c98-b302-d8896415b5f0, pr=nodejs/node/#10181, action=pull_request.labeled)
12:05:33.115  INFO bot: request finish (req_id=5d263e80-f80f-4c98-b302-d8896415b5f0, duration=2, req.query={}, req.remoteAddress=::ffff:192.30.252.40, req.remotePort=60736)
    POST /hooks/github HTTP/1.1
    host: github-bot.nodejs.org:3333
    accept: */*
    user-agent: GitHub-Hookshot/4f5b94b
    x-github-event: pull_request
    x-github-delivery: 86f79600-bd68-11e6-80cc-443116482953
    content-type: application/json
    x-hub-signature: null
    content-length: 19971
    --
    HTTP/1.1 200 OK
    HTTP/1.1 200 OK
    X-Powered-By: Express
    X-Request-Id: 5d263e80-f80f-4c98-b302-d8896415b5f0
    Date: Thu, 08 Dec 2016 17:05:33 GMT
    Connection: keep-alive
    Content-Length: 0
12:05:33.684 DEBUG bot: updating git remotes... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:34.178 DEBUG bot: checking out origin/v6.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:34.599 DEBUG bot: resetting origin/v6.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:34.731 DEBUG bot: fetching diff from pr 10181... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:34.732 DEBUG bot: attempting a backport to v6... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:34.740 DEBUG bot: backport to 6 failed (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:34.740 DEBUG bot: processing a new backport to v4 (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:34.740 DEBUG bot: aborting any previous backport attempt... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:34.743 DEBUG bot: resetting origin/v4.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:35.751 DEBUG bot: updating git remotes... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:36.239 DEBUG bot: checking out origin/v4.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:36.630 DEBUG bot: resetting origin/v4.x-staging... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:36.768 DEBUG bot: fetching diff from pr 10181... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:36.770 DEBUG bot: attempting a backport to v4... (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)
12:05:36.780 DEBUG bot: backport to 4 failed (req_id=ac0bc597-a8ed-410f-a253-8cfdbabd7324, pr=nodejs/node/#10181, action=pull_request.opened)

... deploying some extra debugging live now ...

@Fishrock123
Copy link
Contributor Author

Fishrock123 commented Dec 8, 2016

also nodejs/node#10182

@Fishrock123
Copy link
Contributor Author

x_x

It turns out it was failing because there was no git author set.

The full output if anyone is that curious...
12:56:35.277 DEBUG bot: processing a new backport to v7 (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:35.277 DEBUG bot: aborting any previous backport attempt... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:35.283  INFO bot: request finish (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, duration=9, req.query={}, req.remoteAddress=::ffff:192.30.252.40, req.remotePort=44427)
    POST /hooks/github HTTP/1.1
    host: github-bot.nodejs.org:3333
    accept: */*
    user-agent: GitHub-Hookshot/4f5b94b
    x-github-event: pull_request
    x-github-delivery: a8a84b80-bd6f-11e6-9f98-099a654b57a2
    content-type: application/json
    x-hub-signature: null
    content-length: 19655
    --
    HTTP/1.1 200 OK
    HTTP/1.1 200 OK
    X-Powered-By: Express
    X-Request-Id: 628c5be5-b1e3-4c25-a296-68f850f68b80
    Date: Thu, 08 Dec 2016 17:56:35 GMT
    Connection: keep-alive
    Content-Length: 0
12:56:35.290 DEBUG bot: resetting origin/v7.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:36.559 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at 778e5f7d0c test: fix error in test-cluster-worker-death.js

12:56:36.567 DEBUG bot: updating git remotes... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:36.583 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    Fetching origin

12:56:37.131 DEBUG bot: checking out origin/v7.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.283 DEBUG bot: Fetching PR files for labelling (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.463 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at 778e5f7d0c... test: fix error in test-cluster-worker-death.js

12:56:37.465 DEBUG bot: resetting origin/v7.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.610 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at 778e5f7d0c test: fix error in test-cluster-worker-death.js

12:56:37.613 DEBUG bot: fetching diff from pr 10183... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.619 DEBUG bot: attempting a backport to v7... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.628 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)

    *** Please tell me who you are.

    Run

      git config --global user.email "[email protected]"
      git config --global user.name "Your Name"

    to set your account's default identity.
    Omit --global to set the identity only in this repository.

    fatal: empty ident name (for <(null)>) not allowed

12:56:37.629 DEBUG bot: backport to 7 failed (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.629 DEBUG bot: Trying to add labels: dont-land-on-v7.x (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.632 DEBUG bot: processing a new backport to v6 (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.632 DEBUG bot: aborting any previous backport attempt... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.635 DEBUG bot: resetting origin/v6.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.821  INFO bot: Added labels: dont-land-on-v7.x (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.832 DEBUG bot: Filled existing repo labels cache: addons,aix,arm,assert,async_hooks,async_wrap,benchmark,blocked,buffer,build,c++,cares,child_process,cluster,code-and-learn,confirmed-bug,console,crypto,ctc-agenda,ctc-review,debugger,dgram,discuss,dns,doc,domain,dont-land-on-v4.x,dont-land-on-v6.x,dont-land-on-v7.x,duplicate,errors,events,feature request,freebsd,fs,good first contribution,help wanted,http,https,http_parser,in progress,install,intl,invalid,land-on-v4.x,land-on-v6.x,lib / src,libuv,lts,lts-agenda,lts-watch-v0.12,lts-watch-v4.x,lts-watch-v6.x,macos,memory,mentor-available,meta,mips,module,net,notable-change,npm,openssl,os,path,performance,post-mortem,ppc,process,promises,punycode,querystring,question,readline,repl,repro-exists,s390,security,semver-major,semver-minor,smartos,stalled,stream,string_decoder,test,timers,tls,tools,tty,url,util,v0.12,v4.x,v6.x,v7.x,V8,V8_inspector,vm,windows,wontfix,zlib (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.832 DEBUG bot: Resolved labels: test (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.833 DEBUG bot: Trying to add labels: test (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:37.862 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    From b473fd5224bedffb63bb446098f431809d7a685e Mon Sep 17 00:00:00 2001
    From: Adrian Estrada <[email protected]>
    Date: Thu, 8 Dec 2016 12:53:02 -0500
    Subject: [PATCH] test: use ES6 in test-debugger-client.js

    implements ES6 const and let instead var in test-debugger-client.js
    ---
     test/debugger/test-debugger-client.js | 70 +++++++++++++++++------------------
     1 file changed, 35 insertions(+), 35 deletions(-)

    diff --git a/test/debugger/test-debugger-client.js b/test/debugger/test-debugger-client.js
    index 0482311..743a3c4 100644
    --- a/test/debugger/test-debugger-client.js
    +++ b/test/debugger/test-debugger-client.js
    @@ -1,12 +1,12 @@
     'use strict';
     const common = require('../common');
    -var assert = require('assert');
    -var debug = require('_debugger');
    +const assert = require('assert');
    +const debug = require('_debugger');

     process.env.NODE_DEBUGGER_TIMEOUT = 2000;
    -var debugPort = common.PORT;
    +const debugPort = common.PORT;
     debug.port = debugPort;
    -var spawn = require('child_process').spawn;
    +const spawn = require('child_process').spawn;

     setTimeout(function() {
       if (nodeProcess) nodeProcess.kill('SIGTERM');
    @@ -14,8 +14,8 @@ setTimeout(function() {
     }, 10000).unref();


    -var resCount = 0;
    -var p = new debug.Protocol();
    +let resCount = 0;
    +const p = new debug.Protocol();
     p.onResponse = function(res) {
       resCount++;
     };
    @@ -29,12 +29,1
12:56:37.862 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    2 @@ assert.strictEqual(resCount, 1);

     // Make sure split messages go in.

    -var parts = [];
    +const parts = [];
     parts.push('Content-Length: 336\r\n');
     assert.strictEqual(parts[0].length, 21);
     parts.push('\r\n');
     assert.strictEqual(parts[1].length, 2);
    -var bodyLength = 0;
    +let bodyLength = 0;

     parts.push('{"seq":12,"type":"event","event":"break","body":' +
                '{"invocationText":"#<a Server>');
    @@ -55,7 +55,7 @@ bodyLength += parts[4].length;

     assert.strictEqual(bodyLength, 336);

    -for (var i = 0; i < parts.length; i++) {
    +for (let i = 0; i < parts.length; i++) {
       p.execute(parts[i]);
     }
     assert.strictEqual(resCount, 2);
    @@ -63,24 +63,24 @@ assert.strictEqual(resCount, 2);

     // Make sure that if we get backed up, we still manage to get all the
     // messages
    -var d = 'Content-Length: 466\r\n\r\n' +
    -        '{"seq":10,"type":"event","event":"afterCompile","success":true,' +
    -        '"body":{"script":{"handle":1,"type":"script","name":"dns.
12:56:37.863 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    js",' +
    -        '"id":34,"lineOffset":0,"columnOffset":0,"lineCount":241,' +
    -        '"sourceStart":"(function(module, exports, require) {' +
    -        'var dns = process.binding(\'cares\')' +
    -        ';\\nvar ne","sourceLength":6137,"scriptType":2,"compilationType":0,' +
    -        '"context":{"ref":0},"text":"dns.js (lines: 241)"}},"refs":' +
    -        '[{"handle":0' +
    -        ',"type":"context","text":"#<a ContextMirror>"}],"running":true}' +
    -        '\r\n\r\nContent-Length: 119\r\n\r\n' +
    -        '{"seq":11,"type":"event","event":"scriptCollected","success":true,' +
    -        '"body":{"script":{"id":26}},"refs":[],"running":true}';
    +const d = 'Content-Length: 466\r\n\r\n' +
    +          '{"seq":10,"type":"event","event":"afterCompile","success":true,' +
    +          '"body":{"script":{"handle":1,"type":"script","name":"dns.js",' +
    +          '"id":34,"lineOffset":0,"columnOffset":0,"lineCount":241,' +
    +          '"sourceStart":"(function(module, exports, require) {' +
    +          'var dns = process.binding(\'cares\')' +
    +          ';\\nvar ne","sourceLength":6137,"scriptType":2,"compilationType"' +
    +          ':0,"context":{"ref":0},"text":"dns.js (lines: 241)"}},"refs":' +
    +          '[{"handle":0' +
    +          ',"type":"context","text":"#<a ContextMirror>"}],"running":true}' +
    +          '\r\n\r\nContent-Length: 119\r\n\r\n' +
    +          '{"
12:56:37.864 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    seq":11,"type":"event","event":"scriptCollected","success":true' +
    +          ',"body":{"script":{"id":26}},"refs":[],"running":true}';
     p.execute(d);
     assert.strictEqual(resCount, 4);

    -var expectedConnections = 0;
    -var tests = [];
    +let expectedConnections = 0;
    +const tests = [];
     function addTest(cb) {
       expectedConnections++;
       tests.push(cb);
    @@ -102,9 +102,9 @@ addTest(function(client, done) {
         assert.ok(!err);
         console.error('got %d scripts', Object.keys(client.scripts).length);

    -    var foundMainScript = false;
    -    for (var k in client.scripts) {
    -      var script = client.scripts[k];
    +    let foundMainScript = false;
    +    for (const k in client.scripts) {
    +      const script = client.scripts[k];
           if (script && script.name === 'node.js') {
             foundMainScript = true;
             break;
    @@ -127,19 +127,19 @@ addTest(function(client, done) {
     });


    -var connectCount = 0;
    -var script = 'setTimeout(function() { console.log("blah"); });' +
    -             'setInterval(function() {}, 1000000);';
    +let connectCount = 0;
    +const script = 'setTimeout(function() { console.log("blah"); });' +
    +               'setInterval(function() {}, 1000000);';

    -var nodeProcess;
    +let nodeProcess;

     function doTest(cb, done) {
    -  var args = ['--debug=' + debugPort, '-e', script];
    +  const args = ['--debug=' + debugPort, '-e', script];
       nodePr
12:56:37.864 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    ocess = spawn(process.execPath, args);

       nodeProcess.stdout.once('data', function(c) {
         console.log('>>> new node process: %d', nodeProcess.pid);
    -    var failed = true;
    +    let failed = true;
         try {
           process._debugProcess(nodeProcess.pid);
           failed = false;
    @@ -151,9 +151,9 @@ function doTest(cb, done) {
         console.log('>>> starting debugger session');
       });

    -  var didTryConnect = false;
    +  let didTryConnect = false;
       nodeProcess.stderr.setEncoding('utf8');
    -  var b = '';
    +  let b = '';
       nodeProcess.stderr.on('data', function(data) {
         console.error('got stderr data %j', data);
         nodeProcess.stderr.resume();

12:56:38.008  INFO bot: Added labels: test (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:38.536 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at fb525f1507 test: fix error in test-cluster-worker-death.js

12:56:38.542 DEBUG bot: updating git remotes... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:38.558 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    Fetching origin

12:56:39.022 DEBUG bot: checking out origin/v6.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:39.144  INFO bot: Emitting GitHub event (req_id=696acb9e-4915-43af-a520-7e4f5f520eb6, pr=nodejs/node/#10183, action=pull_request.labeled)
12:56:39.145  INFO bot: request finish (req_id=696acb9e-4915-43af-a520-7e4f5f520eb6, duration=2, req.query={}, req.remoteAddress=::ffff:192.30.252.34, req.remotePort=53588)
    POST /hooks/github HTTP/1.1
    host: github-bot.nodejs.org:3333
    accept: */*
    user-agent: GitHub-Hookshot/4f5b94b
    x-github-event: pull_request
    x-github-delivery: a9d97880-bd6f-11e6-9c33-1afb6d7f2ef3
    content-type: application/json
    x-hub-signature: null
    content-length: 19985
    --
    HTTP/1.1 200 OK
    HTTP/1.1 200 OK
    X-Powered-By: Express
    X-Request-Id: 696acb9e-4915-43af-a520-7e4f5f520eb6
    Date: Thu, 08 Dec 2016 17:56:39 GMT
    Connection: keep-alive
    Content-Length: 0
12:56:39.385 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at fb525f1507... test: fix error in test-cluster-worker-death.js

12:56:39.387 DEBUG bot: resetting origin/v6.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:39.520 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at fb525f1507 test: fix error in test-cluster-worker-death.js

12:56:39.523 DEBUG bot: fetching diff from pr 10183... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:39.525 DEBUG bot: attempting a backport to v6... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:39.531 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)

    *** Please tell me who you are.

    Run

      git config --global user.email "[email protected]"
      git config --global user.name "Your Name"

    to set your account's default identity.
    Omit --global to set the identity only in this repository.

    fatal: empty ident name (for <(null)>) not allowed

100  113k  100  113k    0     0   148k      0 --:--:-- --:--:-- --:--:--  148k
12:56:39.532 DEBUG bot: backport to 6 failed (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:39.532 DEBUG bot: processing a new backport to v4 (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:39.532 DEBUG bot: aborting any previous backport attempt... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:39.535 DEBUG bot: resetting origin/v4.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:39.652  INFO bot: Emitting GitHub event (req_id=c5f98f37-8b16-4a9a-bd36-bef59f7916d2, pr=nodejs/node/#10183, action=pull_request.labeled)
12:56:39.657  INFO bot: request finish (req_id=c5f98f37-8b16-4a9a-bd36-bef59f7916d2, duration=5, req.query={}, req.remoteAddress=::ffff:192.30.252.45, req.remotePort=40016)
    POST /hooks/github HTTP/1.1
    host: github-bot.nodejs.org:3333
    accept: */*
    user-agent: GitHub-Hookshot/4f5b94b
    x-github-event: pull_request
    x-github-delivery: a9d97880-bd6f-11e6-8ef6-e3b751fb419a
    content-type: application/json
    x-hub-signature: null
    content-length: 19959
    --
    HTTP/1.1 200 OK
    HTTP/1.1 200 OK
    X-Powered-By: Express
    X-Request-Id: c5f98f37-8b16-4a9a-bd36-bef59f7916d2
    Date: Thu, 08 Dec 2016 17:56:39 GMT
    Connection: keep-alive
    Content-Length: 0
12:56:39.752 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    From b473fd5224bedffb63bb446098f431809d7a685e Mon Sep 17 00:00:00 2001
    From: Adrian Estrada <[email protected]>
    Date: Thu, 8 Dec 2016 12:53:02 -0500
    Subject: [PATCH] test: use ES6 in test-debugger-client.js

    implements ES6 const and let instead var in test-debugger-client.js
    ---
     test/debugger/test-debugger-client.js | 70 +++++++++++++++++------------------
     1 file changed, 35 insertions(+), 35 deletions(-)

    diff --git a/test/debugger/test-debugger-client.js b/test/debugger/test-debugger-client.js
    index 0482311..743a3c4 100644
    --- a/test/debugger/test-debugger-client.js
    +++ b/test/debugger/test-debugger-client.js
    @@ -1,12 +1,12 @@
     'use strict';
     const common = require('../common');
    -var assert = require('assert');
    -var debug = require('_debugger');
    +const assert = require('assert');
    +const debug = require('_debugger');

     process.env.NODE_DEBUGGER_
12:56:39.752 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    TIMEOUT = 2000;
    -var debugPort = common.PORT;
    +const debugPort = common.PORT;
     debug.port = debugPort;
    -var spawn = require('child_process').spawn;
    +const spawn = require('child_process').spawn;

     setTimeout(function() {
       if (nodeProcess) nodeProcess.kill('SIGTERM');
    @@ -14,8 +14,8 @@ setTimeout(function() {
     }, 10000).unref();


    -var resCount = 0;
    -var p = new debug.Protocol();
    +let resCount = 0;
    +const p = new debug.Protocol();
     p.onResponse = function(res) {
       resCount++;
     };
    @@ -29,12 +29,12 @@ assert.strictEqual(resCount, 1);

     // Make sure split messages go in.

    -var parts = [];
    +const parts = [];
     parts.push('Content-Length: 336\r\n');
     assert.strictEqual(parts[0].length, 21);
     parts.push('\r\n');
     assert.strictEqual(parts[1].length, 2);
    -var bodyLength = 0;
    +let bodyLength = 0;

     parts.push('{"seq":12,"type":"event","event":"break","body":' +
                '{"invocationText":"#<a Server>');
    @@ -55,7 +55,7 @@ bodyLength += parts[4].length;

     assert.strictEqual(bodyLength, 336);

    -for (var i = 0; i < parts.length; i++) {
    +for (let i = 0; i < parts.length; i++) {
       p.execute(parts[i]);
     }
     assert.strictEqual(resCount, 2);
    @@ -63,24 +63,24 @@ assert.strictEqual(resCount, 2);

     // Make sure that if we get backed up, we still manage to get all the
     // messages
    -var d = 'Content-Length: 466\r\n\r\n' +
    -        '{"seq":10,"type":"event",
12:56:39.752 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    "event":"afterCompile","success":true,' +
    -        '"body":{"script":{"handle":1,"type":"script","name":"dns.
12:56:39.754 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    js",' +
    -        '"id":34,"lineOffset":0,"columnOffset":0,"lineCount":241,' +
    -        '"sourceStart":"(function(module, exports, require) {' +
    -        'var dns = process.binding(\'cares\')' +
    -        ';\\nvar ne","sourceLength":6137,"scriptType":2,"compilationType":0,' +
    -        '"context":{"ref":0},"text":"dns.js (lines: 241)"}},"refs":' +
    -        '[{"handle":0' +
    -        ',"type":"context","text":"#<a ContextMirror>"}],"running":true}' +
    -        '\r\n\r\nContent-Length: 119\r\n\r\n' +
    -        '{"seq":11,"type":"event","event":"scriptCollected","success":true,' +
    -        '"body":{"script":{"id":26}},"refs":[],"running":true}';
    +const d = 'Content-Length: 466\r\n\r\n' +
    +          '{"seq":10,"type":"event","event":"afterCompile","success":true,' +
    +          '"body":{"script":{"handle":1,"type":"script","name":"dns.js",' +
    +          '"id":34,"lineOffset":0,"columnOffset":0,"lineCount":241,' +
    +          '"sourceStart":"(function(module, exports, require) {' +
    +          'var dns = process.binding(\'cares\')' +
    +          ';\\nvar ne","sourceLength":6137,"scriptType":2,"compilationType"' +
    +          ':0,"context":{"ref":0},"text":"dns.js (lines: 241)"}},"refs":' +
    +          '[{"handle":0' +
    +          ',"type":"context","text":"#<a ContextMirror>"}],"running":true}' +
    +          '\r\n\r\nContent-Length: 119\r\n\r\n' +
    +          '{"
12:56:39.754 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    seq":11,"type":"event","event":"scriptCollected","success":true' +
    +          ',"body":{"script":{"id":26}},"refs":[],"running":true}';
     p.execute(d);
     assert.strictEqual(resCount, 4);

    -var expectedConnections = 0;
    -var tests = [];
    +let expectedConnections = 0;
    +const tests = [];
     function addTest(cb) {
       expectedConnections++;
       tests.push(cb);
    @@ -102,9 +102,9 @@ addTest(function(client, done) {
         assert.ok(!err);
         console.error('got %d scripts', Object.keys(client.scripts).length);

    -    var foundMainScript = false;
    -    for (var k in client.scripts) {
    -      var script = client.scripts[k];
    +    let foundMainScript = false;
    +    for (const k in client.scripts) {
    +      const script = client.scripts[k];
           if (script && script.name === 'node.js') {
             foundMainScript = true;
             break;
    @@ -127,19 +127,19 @@ addTest(function(client, done) {
     });


    -var connectCount = 0;
    -var script = 'setTimeout(function() { console.log("blah"); });' +
    -             'setInterval(function() {}, 1000000);';
    +let connectCount = 0;
    +const script = 'setTimeout(function() { console.log("blah"); });' +
    +               'setInterval(function() {}, 1000000);';

    -var nodeProcess;
    +let nodeProcess;

     function doTest(cb, done) {
    -  var args = ['--debug=' + debugPort, '-e', script];
    +  const args = ['--debug=' + debugPort, '-e', script];
       nodePr
12:56:39.754 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    ocess = spawn(process.execPath, args);

       nodeProcess.stdout.once('data', function(c) {
         console.log('>>> new node process: %d', nodeProcess.pid);
    -    var failed = true;
    +    let failed = true;
         try {
           process._debugProcess(nodeProcess.pid);
           failed = false;
    @@ -151,9 +151,9 @@ function doTest(cb, done) {
         console.log('>>> starting debugger session');
       });

    -  var didTryConnect = false;
    +  let didTryConnect = false;
       nodeProcess.stderr.setEncoding('utf8');
    -  var b = '';
    +  let b = '';
       nodeProcess.stderr.on('data', function(data) {
         console.error('got stderr data %j', data);
         nodeProcess.stderr.resume();

12:56:40.906 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at cc36a63205 test: remove watchdog in test-debug-signal-cluster

12:56:40.913 DEBUG bot: updating git remotes... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:40.926 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    Fetching origin

12:56:41.387 DEBUG bot: checking out origin/v4.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:41.670 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at cc36a63205... test: remove watchdog in test-debug-signal-cluster

12:56:41.674 DEBUG bot: resetting origin/v4.x-staging... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:41.789 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    HEAD is now at cc36a63205 test: remove watchdog in test-debug-signal-cluster

12:56:41.791 DEBUG bot: fetching diff from pr 10183... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:41.792 DEBUG bot: attempting a backport to v4... (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:41.798 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)

    *** Please tell me who you are.

    Run

      git config --global user.email "[email protected]"
      git config --global user.name "Your Name"

    to set your account's default identity.
    Omit --global to set the identity only in this repository.


12:56:41.802 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    fatal: empty ident name (for <(null)>) not allowed

12:56:41.803 DEBUG bot: backport to 4 failed (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
12:56:42.006 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    From b473fd5224bedffb63bb446098f431809d7a685e Mon Sep 17 00:00:00 2001
    From: Adrian Estrada <[email protected]>
    Date: Thu, 8 Dec 2016 12:53:02 -0500
    Subject: [PATCH] test: use ES6 in test-debugger-client.js

    implements ES6 const and let instead var in test-debugger-client.js
    ---
     test/debugger/test-debugger-client.js | 70 +++++++++++++++++------------------
     1 file changed, 35 insertions(+), 35 deletions(-)

    diff --git a/test/debugger/test-debugger-client.js b/test/debugger/test-debugger-client.js
    index 0482311..743a3c4 100644
    --- a/test/debugger/test-debugger-client.js
    +++ b/test/debugger/test-debugger-client.js
    @@ -1,12 +1,12 @@
     'use strict';
     const common = require('../common');
    -var assert = require('assert');
    -var debug = require('_debugger');
    +const assert = require('assert');
    +const debug = require('_debugger');

     process.env.NODE_DEBUGGER_TIMEOUT = 2000;
    -var debugPort = common.PORT;
    +const debugPort = common.PORT;
     debug.port = debugPort;
    -var spawn = require('child_process').spawn;
    +const spawn = require('child_process').spawn;

     setTimeout(function() {
       if (nodeProcess) nodeProcess.kill('SIGTERM');
    @@ -14,8 +14,8 @@ setTimeout(function() {
     }, 10000).unref();


    -var resCount = 0;
    -var p = new debug.Protocol();
    +let resCount = 0;
    +const p = new debug.Protocol();
     p.onResponse = function(res) {
       resCount++;
     };
    @@ -29,12 +29,1
12:56:42.006 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    2 @@ assert.strictEqual(resCount, 1);

     // Make sure split messages go in.

    -var parts = [];
    +const parts = [];
     parts.push('Content-Length: 336\r\n');
     assert.strictEqual(parts[0].length, 21);
     parts.push('\r\n');
     assert.strictEqual(parts[1].length, 2);
    -var bodyLength = 0;
    +let bodyLength = 0;

     parts.push('{"seq":12,"type":"event","event":"break","body":' +
                '{"invocationText":"#<a Server>');
    @@ -55,7 +55,7 @@ bodyLength += parts[4].length;

     assert.strictEqual(bodyLength, 336);

    -for (var i = 0; i < parts.length; i++) {
    +for (let i = 0; i < parts.length; i++) {
       p.execute(parts[i]);
     }
     assert.strictEqual(resCount, 2);
    @@ -63,24 +63,24 @@ assert.strictEqual(resCount, 2);

     // Make sure that if we get backed up, we still manage to get all the
     // messages
    -var d = 'Content-Length: 466\r\n\r\n' +
    -        '{"seq":10,"type":"event","event":"afterCompile","success":true,' +
    -        '"body":{"script":{"handle":1,"type":"script","name":"dns.
12:56:42.009 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    js",' +
    -        '"id":34,"lineOffset":0,"columnOffset":0,"lineCount":241,' +
    -        '"sourceStart":"(function(module, exports, require) {' +
    -        'var dns = process.binding(\'cares\')' +
    -        ';\\nvar ne","sourceLength":6137,"scriptType":2,"compilationType":0,' +
    -        '"context":{"ref":0},"text":"dns.js (lines: 241)"}},"refs":' +
    -        '[{"handle":0' +
    -        ',"type":"context","text":"#<a ContextMirror>"}],"running":true}' +
    -        '\r\n\r\nContent-Length: 119\r\n\r\n' +
    -        '{"seq":11,"type":"event","event":"scriptCollected","success":true,' +
    -        '"body":{"script":{"id":26}},"refs":[],"running":true}';
    +const d = 'Content-Length: 466\r\n\r\n' +
    +          '{"seq":10,"type":"event","event":"afterCompile","success":true,' +
    +          '"body":{"script":{"handle":1,"type":"script","name":"dns.js",' +
    +          '"id":34,"lineOffset":0,"columnOffset":0,"lineCount":241,' +
    +          '"sourceStart":"(function(module, exports, require) {' +
    +          'var dns = process.binding(\'cares\')' +
    +          ';\\nvar ne","sourceLength":6137,"scriptType":2,"compilationType"' +
    +          ':0,"context":{"ref":0},"text":"dns.js (lines: 241)"}},"refs":' +
    +          '[{"handle":0' +
    +          ',"type":"context","text":"#<a ContextMirror>"}],"running":true}' +
    +          '\r\n\r\nContent-Length: 119\r\n\r\n' +
    +          '{"
12:56:42.009 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    seq":11,"type":"event","event":"scriptCollected","success":true' +
    +          ',"body":{"script":{"id":26}},"refs":[],"running":true}';
     p.execute(d);
     assert.strictEqual(resCount, 4);

    -var expectedConnections = 0;
    -var tests = [];
    +let expectedConnections = 0;
    +const tests = [];
     function addTest(cb) {
       expectedConnections++;
       tests.push(cb);
    @@ -102,9 +102,9 @@ addTest(function(client, done) {
         assert.ok(!err);
         console.error('got %d scripts', Object.keys(client.scripts).length);

    -    var foundMainScript = false;
    -    for (var k in client.scripts) {
    -      var script = client.scripts[k];
    +    let foundMainScript = false;
    +    for (const k in client.scripts) {
    +      const script = client.scripts[k];
           if (script && script.name === 'node.js') {
             foundMainScript = true;
             break;
    @@ -127,19 +127,19 @@ addTest(function(client, done) {
     });


    -var connectCount = 0;
    -var script = 'setTimeout(function() { console.log("blah"); });' +
    -             'setInterval(function() {}, 1000000);';
    +let connectCount = 0;
    +const script = 'setTimeout(function() { console.log("blah"); });' +
    +               'setInterval(function() {}, 1000000);';

    -var nodeProcess;
    +let nodeProcess;

     function doTest(cb, done) {
    -  var args = ['--debug=' + debugPort, '-e', script];
    +  const args = ['--debug=' + debugPort, '-e', script];
       nodePr
12:56:42.009 DEBUG bot: (req_id=628c5be5-b1e3-4c25-a296-68f850f68b80, pr=nodejs/node/#10183, action=pull_request.opened)
    ocess = spawn(process.execPath, args);

       nodeProcess.stdout.once('data', function(c) {
         console.log('>>> new node process: %d', nodeProcess.pid);
    -    var failed = true;
    +    let failed = true;
         try {
           process._debugProcess(nodeProcess.pid);
           failed = false;
    @@ -151,9 +151,9 @@ function doTest(cb, done) {
         console.log('>>> starting debugger session');
       });

    -  var didTryConnect = false;
    +  let didTryConnect = false;
       nodeProcess.stderr.setEncoding('utf8');
    -  var b = '';
    +  let b = '';
       nodeProcess.stderr.on('data', function(data) {
         console.error('got stderr data %j', data);
         nodeProcess.stderr.resume();

@Fishrock123
Copy link
Contributor Author

another: nodejs/node#10183

@Fishrock123 Fishrock123 changed the title attempt-backport still does not work attempt-backport still does not work Edit: working? Dec 8, 2016
@Fishrock123
Copy link
Contributor Author

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
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)

@MylesBorins
Copy link
Contributor

MylesBorins commented Dec 8, 2016 via email

@Fishrock123
Copy link
Contributor Author

I already cleaned them up. They would only ever have been the dont-land-on-v7.x since the lts labels only apply if it passes.

@targos
Copy link
Member

targos commented Dec 9, 2016

The bot keeps adding labels that are already present and it can be a bit noisy if there are many pushes: nodejs/node#9283
Can we do something about it?

@MylesBorins
Copy link
Contributor

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

@phillipj
Copy link
Member

Perhaps we can do a diff against current labels and only update if there is a change.

Sounds good. Such a change would probably be in lib/node-repo.js#updatePrWithLabels() if anyone wants to give it a shot.

@Fishrock123
Copy link
Contributor Author

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...

@Fishrock123 Fishrock123 changed the title attempt-backport still does not work Edit: working? attempt-backport still does not work Edit: now working?! Dec 11, 2016
@Fishrock123
Copy link
Contributor Author

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 dont-land-on labels it is pretty suspect.

Fishrock123 added a commit that referenced this issue Dec 11, 2016
@phillipj
Copy link
Member

It's not fully borked, this got labeled a few hours ago: nodejs/node#9916

@Fishrock123
Copy link
Contributor Author

So strange. nodejs/node#9931 applies cleanly on all branches but was during the window when something went wrong...

@Fishrock123
Copy link
Contributor Author

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

@Fishrock123
Copy link
Contributor Author

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.

@Fishrock123
Copy link
Contributor Author

UH OH.

Problem is occurring again. This time I have logs on and this is showing up:

    fatal: Unable to create '/home/iojs/repos/node/.git/index.lock': File exists.

    Another git process seems to be running in this repository, e.g.
    an editor opened by 'git commit'. Please make sure all processes
    are terminated then try again. If it still fails, a git process
    may have crashed in this repository earlier:

Digging though the logs more to try to find what started it.

@Fishrock123
Copy link
Contributor Author

Ok I think it started here:

17:51:46.616  INFO bot: Emitting GitHub event (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
17:51:46.616 DEBUG bot: processing a new backport to v7 (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
17:51:46.616 DEBUG bot: aborting any previous backport attempt... (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
17:51:46.620  INFO bot: request finish (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, duration=5, req.query={}, req.remoteAddress=::ffff:192.30.252.45, req.remotePort=54018)
17:51:46.899 DEBUG bot: resetting origin/v7.x-staging... (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)

↕︎ Problem is here ↕︎

17:51:47.504  INFO bot: Emitting GitHub event (req_id=437bf662-6762-4ace-b416-6b1a2f36bcad, pr=nodejs/node/#10193, action=pull_request.synchronize)
17:51:47.505 DEBUG bot: processing a new backport to v6 (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
17:51:47.505 DEBUG bot: aborting any previous backport attempt... (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
17:51:47.510  INFO bot: request finish (req_id=437bf662-6762-4ace-b416-6b1a2f36bcad, duration=5, req.query={}, req.remoteAddress=::ffff:192.30.252.34, req.remotePort=63313)
17:51:47.573 DEBUG bot: resetting origin/v6.x-staging... (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
17:51:47.600 DEBUG bot: (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
    fatal: Unable to create '/home/iojs/repos/node/.git/index.lock': File exists.

    Another git process seems to be running in this repository, e.g.
    an editor opened by 'git commit'. Please make sure all processes
    are terminated then try again. If it still fails, a git process
    may have crashed in this repository earlier:

17:51:47.605 DEBUG bot: (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
    remove the file manually to continue.

17:51:47.606 DEBUG bot: backport to 6 failed (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
17:51:47.606 DEBUG bot: processing a new backport to v4 (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)

Looks like there is a bug where parallel access to the git repo can occur. :/
Thought I guarded well against that but I guess not well enough.

@Fishrock123
Copy link
Contributor Author

Of note:

17:51:46.899 DEBUG bot: resetting origin/v7.x-staging... (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)
17:51:47.504  INFO bot: Emitting GitHub event (req_id=437bf662-6762-4ace-b416-6b1a2f36bcad, pr=nodejs/node/#10193, action=pull_request.synchronize)
17:51:47.505 DEBUG bot: processing a new backport to v6 (req_id=e7004492-fcbb-469c-8b0c-0f758baaea5c, pr=nodejs/node/#10257, action=pull_request.opened)

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.

@phillipj
Copy link
Member

Looks like there is a bug where parallel access to the git repo can occur. :/

Also worth mentioning for others not knowing the deployment details; there's only one bot process running.

@joaocgreis
Copy link
Member

Here is another one: nodejs/node#10156 . 20h ago was the last time it added the dont-land-on-v7.x label, then 19h ago it added only the lts-watch labels.

@Fishrock123
Copy link
Contributor Author

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:

  1. Do this reset at the end, it should only be necessary if a backport is successful because otherwise it will be in the "borked" git am state which we already cleanly get rid of each time.
  2. Use fancy scripts to figure out the lowest-hierarchy "original" base branch of the current commit and reset to that.
    • E.g. this thanks to @trevnorris:
      while read i; do
        loc=$(git branch --contains $i -r 2> /dev/null | grep HEAD);
        if [[ ! -z "$loc" ]]; then
          echo "$loc" | cut -d\  -f 3;
          break;
        fi;
      done < <(git rev-list HEAD)
  3. I think this step was necessary... maybe it isn't?

@Fishrock123
Copy link
Contributor Author

But I don't think the above should fail in that way or cause this? The logs do point to it though...? :/

Fishrock123 added a commit to Fishrock123/github-bot that referenced this issue Dec 15, 2016
- 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.
@Fishrock123
Copy link
Contributor Author

#107 might fix the overarching issue. (maybe. (?))

It does remove the (almost certainly) unnecessary step(s) I just described though.

Fishrock123 added a commit to Fishrock123/github-bot that referenced this issue Dec 22, 2016
- 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
@Fishrock123
Copy link
Contributor Author

I think #107 fixed it since no-one has yelled my way in the past 3 weeks lol

@phillipj
Copy link
Member

Might look like there's still something fishy.

I just rebased nodejs/node#6601 against master and it got labeled with dont-land-on-v7.x with the following visible in the logs:

13:36:06.288Z DEBUG bot: fetching diff from pr 6601... (req_id=bfc52a0a-3814-41f5-aac9-75d1f6218721, pr=nodejs/node/#6601, action=pull_request.synchronize)
13:36:06.289Z DEBUG bot: attempting a backport to v7... (req_id=bfc52a0a-3814-41f5-aac9-75d1f6218721, pr=nodejs/node/#6601, action=pull_request.synchronize)
13:36:06.661Z DEBUG bot: (req_id=bfc52a0a-3814-41f5-aac9-75d1f6218721, pr=nodejs/node/#6601, action=pull_request.synchronize)
    error: patch failed: test/doctool/test-doctool-html.js:97
    
13:36:06.662Z DEBUG bot: (req_id=bfc52a0a-3814-41f5-aac9-75d1f6218721, pr=nodejs/node/#6601, action=pull_request.synchronize)
    error: test/doctool/test-doctool-html.js: patch does not apply
    
13:36:06.662Z DEBUG bot: (req_id=bfc52a0a-3814-41f5-aac9-75d1f6218721, pr=nodejs/node/#6601, action=pull_request.synchronize)
    Applying: tools,doc: add Google Analytics tracking.
    Patch failed at 0001 tools,doc: add Google Analytics tracking.
    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".
    
13:36:06.663Z DEBUG bot: backport to 7 failed (req_id=bfc52a0a-3814-41f5-aac9-75d1f6218721, pr=nodejs/node/#6601, action=pull_request.synchronize)

That patch lands cleanly on master for me :/

@phillipj
Copy link
Member

^ doh nevermind. Forgot master !== v7. I get the same issues as seen in the logs when trying to land patch on v7.x-staging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants