106838 2013-01-14 16:04:04 -0800 kill whole lighttpd process tree for chromium win 2013-01-15 12:40:29 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth cmp eric kerz tony webkit.review.bot oldest_to_newest 806720 0 dpranke 2013-01-14 16:04:04 -0800 This is a speculative bug fix for http://code.google.com/p/chromium/issues/detail?id=169530 . My guess is that while we are able to kill the initial lighttp process, some child process is getting hung (as evidenced by a bunch of tests timing out) and killing the parent outright doesn't kill the children. 806757 1 182658 dpranke 2013-01-14 16:32:55 -0800 Created attachment 182658 Patch 806759 2 dpranke 2013-01-14 16:33:48 -0800 Tony, what do you think of this? I can add lighttpd.exe to the list of processes to kill as well, but this seems like a "more correct" change. 806764 3 182658 tony 2013-01-14 16:43:13 -0800 Comment on attachment 182658 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182658&action=review I think the change is a fine way to prevent the bot from hanging, but the test run will still be junk because of too many timeouts. It'll probably confuse garden-o-matic a bit. > Tools/ChangeLog:9 > + Land a speculative fix for lighttpd.exe hanging on some google > + internal win bots; I think a test is causing a httpd server child process to I would remove internal since this is failing on the public build.chromium.org too (the Win bots used by the gardening tools). > Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:36 > +from webkitpy.thirdparty.autoinstalled import unittest2 as unittest I would make this change separately. 806774 4 dpranke 2013-01-14 16:52:03 -0800 (In reply to comment #3) > (From update of attachment 182658 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182658&action=review > > I think the change is a fine way to prevent the bot from hanging, but the test run will still be junk because of too many timeouts. It'll probably confuse garden-o-matic a bit. > Yeah, but that's no worse than any other too-many-timeouts build run failure, right? Note for the record that at the moment it's not clear what's causing the too many timeouts, possibly it's a server bug caused by a particular test, or possibly its the parallelism in the test harness ... > > Tools/ChangeLog:9 > > + Land a speculative fix for lighttpd.exe hanging on some google > > + internal win bots; I think a test is causing a httpd server child process to > > I would remove internal since this is failing on the public build.chromium.org too (the Win bots used by the gardening tools). > It is? I looked earlier today and didn't see any hangs on either the XP or Win7 canaries. I thought I saw one report of a hang earlier on a webkit.org bot, but I didn't see anyting recent there, either. At any rate, I'm happy to remove the comment. > > Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:36 > > +from webkitpy.thirdparty.autoinstalled import unittest2 as unittest > > I would make this change separately. This was needed for the self.assertIn() method I'm using in the test (since that's new in 2.7 and we need unittest2 for 2.6 compatibility). Does that make this okay or do you want me to switch to a 2.6-compatible method like assertEquals() ? 806782 5 tony 2013-01-14 17:00:03 -0800 (In reply to comment #4) > (In reply to comment #3) > > > Tools/ChangeLog:9 > > > + Land a speculative fix for lighttpd.exe hanging on some google > > > + internal win bots; I think a test is causing a httpd server child process to > > > > I would remove internal since this is failing on the public build.chromium.org too (the Win bots used by the gardening tools). > > > > It is? I looked earlier today and didn't see any hangs on either the XP or Win7 canaries. I thought I saw one report of a hang earlier on a webkit.org bot, but I didn't see anyting recent there, either. WebKit Win7 has been hung since 5am and WebKit Win7 (dbg)(2) has been hung for days. http://build.chromium.org/p/chromium.webkit/waterfall?show=WebKit%20Win7&show=WebKit%20Win7%20(dbg)(2) The dbg hang might not be the same. I don't see lots of tests timing out. > > > Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:36 > > > +from webkitpy.thirdparty.autoinstalled import unittest2 as unittest > > > > I would make this change separately. > > This was needed for the self.assertIn() method I'm using in the test (since that's new in 2.7 and we need unittest2 for 2.6 compatibility). Does that make this okay or do you want me to switch to a 2.6-compatible method like assertEquals() ? I would make the switch to unittest2 first, then land this patch. 806788 6 dpranke 2013-01-14 17:02:24 -0800 (In reply to comment #5) > > It is? I looked earlier today and didn't see any hangs on either the XP or Win7 canaries. I thought I saw one report of a hang earlier on a webkit.org bot, but I didn't see anyting recent there, either. > > WebKit Win7 has been hung since 5am and WebKit Win7 (dbg)(2) has been hung for days. > http://build.chromium.org/p/chromium.webkit/waterfall?show=WebKit%20Win7&show=WebKit%20Win7%20(dbg)(2) > Ah, you're right. I misread that one. 806792 7 182663 dpranke 2013-01-14 17:05:31 -0800 Created attachment 182663 patch for landing 806830 8 182663 webkit.review.bot 2013-01-14 17:42:20 -0800 Comment on attachment 182663 patch for landing Clearing flags on attachment: 182663 Committed r139697: <http://trac.webkit.org/changeset/139697> 806831 9 webkit.review.bot 2013-01-14 17:42:24 -0800 All reviewed patches have been landed. Closing bug. 807494 10 182663 tony 2013-01-15 11:21:10 -0800 Comment on attachment 182663 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=182663&action=review > Tools/Scripts/webkitpy/layout_tests/servers/http_server.py:224 > + self._executive.run_command(["taskkill.exe", "/f", "/t", self._pid], error_handler=self._executive.ignore_error) This command is wrong: D:\src\src>taskkill.exe /f /t 4608 ERROR: Invalid argument/option - '4608'. Type "TASKKILL /?" for usage. It's missing a /pid before the number. 807498 11 eric 2013-01-15 11:25:05 -0800 Executive has a kill() function which does taskkill.exe on windows iirc. 807499 12 eric 2013-01-15 11:25:35 -0800 (In reply to comment #11) > Executive has a kill() function which does taskkill.exe on windows iirc. I see the patch now. nevermind. 807516 13 tony 2013-01-15 11:37:16 -0800 Fixed in http://trac.webkit.org/changeset/139764 and tested on my Windows machine using new-run-webkit-httpd --server {start,stop}. I'll fix all the hung Chromium Windows bots :( 807576 14 dpranke 2013-01-15 12:40:29 -0800 whoops. sigh :(. 182658 2013-01-14 16:32:55 -0800 2013-01-14 17:05:29 -0800 Patch bug-106838-20130114162955.patch text/plain 5336 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NjU1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTdhOWQzMzNkYzc3Mzc0NDQ0NGFjYThjYjM2ZjFjZmFl MjFhNzhmYy4uZmQyYmFkZTgxZTIwNTJkNGIzOTI3Nzc5MDJlNDg0NmZhYjNmOGU0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEzLTAxLTE0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIGtpbGwgd2hvbGUgbGlnaHR0cGQgcHJvY2VzcyB0cmVlIGZvciBjaHJvbWl1bSB3aW4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjgzOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExhbmQgYSBz cGVjdWxhdGl2ZSBmaXggZm9yIGxpZ2h0dHBkLmV4ZSBoYW5naW5nIG9uIHNvbWUgZ29vZ2xlCisg ICAgICAgIGludGVybmFsIHdpbiBib3RzOyBJIHRoaW5rIGEgdGVzdCBpcyBjYXVzaW5nIGEgaHR0 cGQgc2VydmVyIGNoaWxkIHByb2Nlc3MgdG8KKyAgICAgICAgd2VkZ2UgYW5kIGtpbGxpbmcgdGhl IHBhcmVudCBodHRwZCBzZXJ2ZXIgcHJvY2VzcyBpc24ndCBzdWZmaWNpZW50IHRvCisgICAgICAg IGVuc3VyZSB0aGF0IHRoZSBjaGlsZHJlbiBhcmUgYWxzbyBraWxsZWQuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyLnB5OgorICAg ICAgICAoTGlnaHR0cGQuX2NoZWNrX2FuZF9raWxsKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyX3VuaXR0ZXN0LnB5OgorICAgICAg ICAoVGVzdEh0dHBTZXJ2ZXIudGVzdF9zdGFydF9jbWQpOgorICAgICAgICAoVGVzdEh0dHBTZXJ2 ZXIpOgorICAgICAgICAoVGVzdEh0dHBTZXJ2ZXIudGVzdF93aW4zMl9zdGFydF9hbmRfc3RvcCk6 CisgICAgICAgIChUZXN0SHR0cFNlcnZlci50ZXN0X3dpbjMyX3N0YXJ0X2FuZF9zdG9wLndhaXRf Zm9yX2FjdGlvbik6CisgICAgICAgIChUZXN0SHR0cFNlcnZlci50ZXN0X3dpbjMyX3N0YXJ0X2Fu ZF9zdG9wLm1vY2tfcmV0dXJucyk6CisgICAgICAgIChUZXN0SHR0cFNlcnZlci50ZXN0X3dpbjMy X3N0YXJ0X2FuZF9zdG9wLm1vY2tfcmV0dXJucy5yZXR1cm5fdmFsdWVfdGh1bmspOgorCiAyMDEz LTAxLTE0ICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFtjaHJvbWl1bV0gbW92ZSByZW1haW5pbmcgbWV0aG9kcyB0byBkdW1wIFdlYlZpZXdDbGllbnQg Y2FsbGJhY2tzIHRvIFRlc3RSdW5uZXIgbGlicmFyeQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2ZXIucHkKaW5kZXgg MDUxNTg4OTZmODEwNjE1YzMxZGQwNTkwN2JlNTIyMjBiMGI1MDdmNy4uNzI2N2JlNTVmMTJjYjBi Y2RhNTU5NGI2OWQ3NTU2YjVkOTlkNzMzZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyLnB5CkBAIC0yMTQs NiArMjE0LDE1IEBAIGNsYXNzIExpZ2h0dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJh c2UpOgogCiAgICAgZGVmIF9jaGVja19hbmRfa2lsbChzZWxmKToKICAgICAgICAgaWYgc2VsZi5f ZXhlY3V0aXZlLmNoZWNrX3J1bm5pbmdfcGlkKHNlbGYuX3BpZCk6Ci0gICAgICAgICAgICBzZWxm Ll9leGVjdXRpdmUua2lsbF9wcm9jZXNzKHNlbGYuX3BpZCkKKyAgICAgICAgICAgIGhvc3QgPSBz ZWxmLl9wb3J0X29iai5ob3N0CisgICAgICAgICAgICBpZiBob3N0LnBsYXRmb3JtLmlzX3dpbigp IGFuZCBub3QgaG9zdC5wbGF0Zm9ybS5pc19jeWd3aW4oKToKKyAgICAgICAgICAgICAgICAjIEZJ WE1FOiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2ODM4CisgICAg ICAgICAgICAgICAgIyBXZSBuZWVkIHRvIGtpbGwgYWxsIG9mIHRoZSBjaGlsZCBwcm9jZXNzZXMg YXMgd2VsbCBhcyB0aGUKKyAgICAgICAgICAgICAgICAjIHBhcmVudCwgc28gd2UgY2FuJ3QgdXNl IGV4ZWN1dGl2ZS5raWxsX3Byb2Nlc3MoKS4KKyAgICAgICAgICAgICAgICAjCisgICAgICAgICAg ICAgICAgIyBJZiB0aGlzIGlzIGFjdHVhbGx5IHdvcmtpbmcsIHdlIHNob3VsZCBmaWd1cmUgb3V0 IGEgY2xlYW4gQVBJLgorICAgICAgICAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFu ZChbInRhc2traWxsLmV4ZSIsICIvZiIsICIvdCIsIHNlbGYuX3BpZF0sIGVycm9yX2hhbmRsZXI9 c2VsZi5fZXhlY3V0aXZlLmlnbm9yZV9lcnJvcikKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAg ICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLmtpbGxfcHJvY2VzcyhzZWxmLl9waWQpCiAgICAgICAg ICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0dXJuIFRydWUKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2ZXJfdW5pdHRl c3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBf c2VydmVyX3VuaXR0ZXN0LnB5CmluZGV4IDVjYzRhNmVlMGM2Yjg0NTQ3ZTE4OTYzNjllOTQ4NWFl YmY3MjY4MjUuLmNkN2MxMTVmMmIzMzkyNWUyNTE0MzkyMzgxNWM5MzZjOTY3OGZkZmIgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9z ZXJ2ZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvc2VydmVycy9odHRwX3NlcnZlcl91bml0dGVzdC5weQpAQCAtMjYsNyArMjYsNiBAQAogIyAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotaW1wb3J0IHVuaXR0ZXN0CiBpbXBvcnQgcmUK IGltcG9ydCBzeXMKIApAQCAtMzQsNiArMzMsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0 X21vY2sgaW1wb3J0IE1vY2tIb3N0CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGlt cG9ydCB0ZXN0CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5zZXJ2ZXJzLmh0dHBfc2VydmVy IGltcG9ydCBMaWdodHRwZAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuc2VydmVycy5odHRw X3NlcnZlcl9iYXNlIGltcG9ydCBTZXJ2ZXJFcnJvcgorZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5 LmF1dG9pbnN0YWxsZWQgaW1wb3J0IHVuaXR0ZXN0MiBhcyB1bml0dGVzdAogCiAKIGNsYXNzIFRl c3RIdHRwU2VydmVyKHVuaXR0ZXN0LlRlc3RDYXNlKToKQEAgLTYyLDMgKzYyLDM5IEBAIGNsYXNz IFRlc3RIdHRwU2VydmVyKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICdhbGlhcy51 cmwgKz0gKCAiL21vY2svYW5vdGhlci1hZGRpdGlvbmFsLWRpciIgPT4gIi9tb2NrLWNoZWNrb3V0 L29uZS1hZGRpdGlvbmFsLWRpciIgKScsCiAgICAgICAgICAgICAnYWxpYXMudXJsICs9ICggIi9t ZWRpYS1yZXNvdXJjZXMiID0+ICIvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cy9tZWRpYSIgKScs CiAgICAgICAgIF0pCisKKyAgICBkZWYgdGVzdF93aW4zMl9zdGFydF9hbmRfc3RvcChzZWxmKToK KyAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKKyAgICAgICAgdGVzdF9wb3J0ID0gdGVzdC5UZXN0 UG9ydChob3N0KQorICAgICAgICBob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKAorICAg ICAgICAgICAgIi9tb2NrLWNoZWNrb3V0L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3NlcnZlcnMvbGlnaHR0cGQuY29uZiIsICJNb2NrIENvbmZpZ1xuIikKKyAgICAgICAgaG9z dC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZSgKKyAgICAgICAgICAgICIvdXNyL2xpYi9saWdo dHRwZC9saWJsaWdodGNvbXAuZHlsaWIiLCAiTW9jayBkeWxpYiIpCisKKyAgICAgICAgaG9zdC5w bGF0Zm9ybS5pc193aW4gPSBsYW1iZGE6IFRydWUKKyAgICAgICAgaG9zdC5wbGF0Zm9ybS5pc19j eWd3aW4gPSBsYW1iZGE6IEZhbHNlCisKKyAgICAgICAgc2VydmVyID0gTGlnaHR0cGQodGVzdF9w b3J0LCAiL21vY2svb3V0cHV0X2RpciIsCisgICAgICAgICAgICAgICAgICAgICAgICAgIGFkZGl0 aW9uYWxfZGlycz17CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL21vY2svb25lLWFk ZGl0aW9uYWwtZGlyIjogIi9tb2NrLWNoZWNrb3V0L29uZS1hZGRpdGlvbmFsLWRpciIsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiL21vY2svYW5vdGhlci1hZGRpdGlvbmFsLWRpciI6 ICIvbW9jay1jaGVja291dC9vbmUtYWRkaXRpb25hbC1kaXIifSkKKyAgICAgICAgc2VydmVyLl9p c19zZXJ2ZXJfcnVubmluZ19vbl9hbGxfcG9ydHMgPSBsYW1iZGE6IFRydWUKKworICAgICAgICBz ZXJ2ZXIuc3RhcnQoKQorICAgICAgICBzZWxmLmFzc2VydE5vdEVxdWFscyhob3N0LmV4ZWN1dGl2 ZS5jYWxscywgW10pCisKKyAgICAgICAgZGVmIHdhaXRfZm9yX2FjdGlvbihhY3Rpb24pOgorICAg ICAgICAgICAgaWYgYWN0aW9uKCk6CisgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAgICAg ICAgICAgIHJldHVybiBhY3Rpb24oKQorCisgICAgICAgIGRlZiBtb2NrX3JldHVybnMocmV0dXJu X3ZhbHVlcyk6CisgICAgICAgICAgICBkZWYgcmV0dXJuX3ZhbHVlX3RodW5rKCphcmdzLCAqKmt3 YXJncyk6CisgICAgICAgICAgICAgICAgcmV0dXJuIHJldHVybl92YWx1ZXMucG9wKDApCisgICAg ICAgICAgICByZXR1cm4gcmV0dXJuX3ZhbHVlX3RodW5rCisKKyAgICAgICAgaG9zdC5leGVjdXRp dmUuY2hlY2tfcnVubmluZ19waWQgPSBtb2NrX3JldHVybnMoW1RydWUsIEZhbHNlXSkKKyAgICAg ICAgc2VydmVyLl93YWl0X2Zvcl9hY3Rpb24gPSB3YWl0X2Zvcl9hY3Rpb24KKworICAgICAgICBz ZXJ2ZXIuc3RvcCgpCisgICAgICAgIHNlbGYuYXNzZXJ0SW4oWyd0YXNra2lsbC5leGUnLCAnL2Yn LCAnL3QnLCA0Ml0sIGhvc3QuZXhlY3V0aXZlLmNhbGxzKQo= 182663 2013-01-14 17:05:31 -0800 2013-01-15 11:21:10 -0800 patch for landing bug-106838-20130114170232.patch text/plain 5081 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NjU1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTdhOWQzMzNkYzc3Mzc0NDQ0NGFjYThjYjM2ZjFjZmFl MjFhNzhmYy4uOTI4Mjc4OGJhMTc2MzgyM2MwZDY0OWE0MGVkYWZkZWI4NjdlZDUzNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEzLTAxLTE0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIGtpbGwgd2hvbGUgbGlnaHR0cGQgcHJvY2VzcyB0cmVlIGZvciBjaHJvbWl1bSB3aW4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjgzOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExhbmQgYSBz cGVjdWxhdGl2ZSBmaXggZm9yIGxpZ2h0dHBkLmV4ZSBoYW5naW5nIG9uIHNvbWUgY2hyb21pdW0g Ym90czsKKyAgICAgICAgSSB0aGluayBhIHRlc3QgaXMgY2F1c2luZyBhIGh0dHBkIHNlcnZlciBj aGlsZCBwcm9jZXNzIHRvIHdlZGdlIGFuZAorICAgICAgICBraWxsaW5nIHRoZSBwYXJlbnQgaHR0 cGQgc2VydmVyIHByb2Nlc3MgaXNuJ3Qgc3VmZmljaWVudCB0byBlbnN1cmUKKyAgICAgICAgdGhh dCB0aGUgY2hpbGRyZW4gYXJlIGFsc28ga2lsbGVkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlci5weToKKyAgICAgICAgKExpZ2h0 dHBkLl9jaGVja19hbmRfa2lsbCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvc2VydmVycy9odHRwX3NlcnZlcl91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RIdHRw U2VydmVyLnRlc3Rfc3RhcnRfY21kKToKKyAgICAgICAgKFRlc3RIdHRwU2VydmVyKToKKyAgICAg ICAgKFRlc3RIdHRwU2VydmVyLnRlc3Rfd2luMzJfc3RhcnRfYW5kX3N0b3ApOgorICAgICAgICAo VGVzdEh0dHBTZXJ2ZXIudGVzdF93aW4zMl9zdGFydF9hbmRfc3RvcC53YWl0X2Zvcl9hY3Rpb24p OgorICAgICAgICAoVGVzdEh0dHBTZXJ2ZXIudGVzdF93aW4zMl9zdGFydF9hbmRfc3RvcC5tb2Nr X3JldHVybnMpOgorICAgICAgICAoVGVzdEh0dHBTZXJ2ZXIudGVzdF93aW4zMl9zdGFydF9hbmRf c3RvcC5tb2NrX3JldHVybnMucmV0dXJuX3ZhbHVlX3RodW5rKToKKwogMjAxMy0wMS0xNCAgSm9j aGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1d IG1vdmUgcmVtYWluaW5nIG1ldGhvZHMgdG8gZHVtcCBXZWJWaWV3Q2xpZW50IGNhbGxiYWNrcyB0 byBUZXN0UnVubmVyIGxpYnJhcnkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyLnB5CmluZGV4IDA1MTU4ODk2Zjgx MDYxNWMzMWRkMDU5MDdiZTUyMjIwYjBiNTA3ZjcuLjcyNjdiZTU1ZjEyY2IwYmNkYTU1OTRiNjlk NzU1NmI1ZDk5ZDczM2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlci5weQpAQCAtMjE0LDYgKzIxNCwxNSBA QCBjbGFzcyBMaWdodHRwZChodHRwX3NlcnZlcl9iYXNlLkh0dHBTZXJ2ZXJCYXNlKToKIAogICAg IGRlZiBfY2hlY2tfYW5kX2tpbGwoc2VsZik6CiAgICAgICAgIGlmIHNlbGYuX2V4ZWN1dGl2ZS5j aGVja19ydW5uaW5nX3BpZChzZWxmLl9waWQpOgotICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZl LmtpbGxfcHJvY2VzcyhzZWxmLl9waWQpCisgICAgICAgICAgICBob3N0ID0gc2VsZi5fcG9ydF9v YmouaG9zdAorICAgICAgICAgICAgaWYgaG9zdC5wbGF0Zm9ybS5pc193aW4oKSBhbmQgbm90IGhv c3QucGxhdGZvcm0uaXNfY3lnd2luKCk6CisgICAgICAgICAgICAgICAgIyBGSVhNRTogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjgzOAorICAgICAgICAgICAgICAg ICMgV2UgbmVlZCB0byBraWxsIGFsbCBvZiB0aGUgY2hpbGQgcHJvY2Vzc2VzIGFzIHdlbGwgYXMg dGhlCisgICAgICAgICAgICAgICAgIyBwYXJlbnQsIHNvIHdlIGNhbid0IHVzZSBleGVjdXRpdmUu a2lsbF9wcm9jZXNzKCkuCisgICAgICAgICAgICAgICAgIworICAgICAgICAgICAgICAgICMgSWYg dGhpcyBpcyBhY3R1YWxseSB3b3JraW5nLCB3ZSBzaG91bGQgZmlndXJlIG91dCBhIGNsZWFuIEFQ SS4KKyAgICAgICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWyJ0YXNra2ls bC5leGUiLCAiL2YiLCAiL3QiLCBzZWxmLl9waWRdLCBlcnJvcl9oYW5kbGVyPXNlbGYuX2V4ZWN1 dGl2ZS5pZ25vcmVfZXJyb3IpCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIHNl bGYuX2V4ZWN1dGl2ZS5raWxsX3Byb2Nlc3Moc2VsZi5fcGlkKQogICAgICAgICAgICAgcmV0dXJu IEZhbHNlCiAgICAgICAgIHJldHVybiBUcnVlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyX3VuaXR0ZXN0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlcl91bml0 dGVzdC5weQppbmRleCA1Y2M0YTZlZTBjNmI4NDU0N2UxODk2MzY5ZTk0ODVhZWJmNzI2ODI1Li5h ZGQ5YmUwZjQzMjA0NjhlMjY2ZDFlYTU0NjQxYTJlZGEyODk0MTNjIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyX3VuaXR0 ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMv aHR0cF9zZXJ2ZXJfdW5pdHRlc3QucHkKQEAgLTI2LDkgKzI2LDkgQEAKICMgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF CiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAKLWltcG9ydCB1bml0dGVzdAogaW1wb3J0IHJlCiBpbXBvcnQgc3lz CitpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdF9tb2NrIGltcG9y dCBNb2NrSG9zdAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgdGVzdApA QCAtNjIsMyArNjIsMzkgQEAgY2xhc3MgVGVzdEh0dHBTZXJ2ZXIodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICAgICAgJ2FsaWFzLnVybCArPSAoICIvbW9jay9hbm90aGVyLWFkZGl0aW9uYWwt ZGlyIiA9PiAiL21vY2stY2hlY2tvdXQvb25lLWFkZGl0aW9uYWwtZGlyIiApJywKICAgICAgICAg ICAgICdhbGlhcy51cmwgKz0gKCAiL21lZGlhLXJlc291cmNlcyIgPT4gIi90ZXN0LmNoZWNrb3V0 L0xheW91dFRlc3RzL21lZGlhIiApJywKICAgICAgICAgXSkKKworICAgIGRlZiB0ZXN0X3dpbjMy X3N0YXJ0X2FuZF9zdG9wKHNlbGYpOgorICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQorICAgICAg ICB0ZXN0X3BvcnQgPSB0ZXN0LlRlc3RQb3J0KGhvc3QpCisgICAgICAgIGhvc3QuZmlsZXN5c3Rl bS53cml0ZV90ZXh0X2ZpbGUoCisgICAgICAgICAgICAiL21vY2stY2hlY2tvdXQvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9saWdodHRwZC5jb25mIiwgIk1vY2sg Q29uZmlnXG4iKQorICAgICAgICBob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKAorICAg ICAgICAgICAgIi91c3IvbGliL2xpZ2h0dHBkL2xpYmxpZ2h0Y29tcC5keWxpYiIsICJNb2NrIGR5 bGliIikKKworICAgICAgICBob3N0LnBsYXRmb3JtLmlzX3dpbiA9IGxhbWJkYTogVHJ1ZQorICAg ICAgICBob3N0LnBsYXRmb3JtLmlzX2N5Z3dpbiA9IGxhbWJkYTogRmFsc2UKKworICAgICAgICBz ZXJ2ZXIgPSBMaWdodHRwZCh0ZXN0X3BvcnQsICIvbW9jay9vdXRwdXRfZGlyIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgYWRkaXRpb25hbF9kaXJzPXsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICIvbW9jay9vbmUtYWRkaXRpb25hbC1kaXIiOiAiL21vY2stY2hlY2tvdXQvb25l LWFkZGl0aW9uYWwtZGlyIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIvbW9jay9h bm90aGVyLWFkZGl0aW9uYWwtZGlyIjogIi9tb2NrLWNoZWNrb3V0L29uZS1hZGRpdGlvbmFsLWRp ciJ9KQorICAgICAgICBzZXJ2ZXIuX2lzX3NlcnZlcl9ydW5uaW5nX29uX2FsbF9wb3J0cyA9IGxh bWJkYTogVHJ1ZQorCisgICAgICAgIHNlcnZlci5zdGFydCgpCisgICAgICAgIHNlbGYuYXNzZXJ0 Tm90RXF1YWxzKGhvc3QuZXhlY3V0aXZlLmNhbGxzLCBbXSkKKworICAgICAgICBkZWYgd2FpdF9m b3JfYWN0aW9uKGFjdGlvbik6CisgICAgICAgICAgICBpZiBhY3Rpb24oKToKKyAgICAgICAgICAg ICAgICByZXR1cm4gVHJ1ZQorICAgICAgICAgICAgcmV0dXJuIGFjdGlvbigpCisKKyAgICAgICAg ZGVmIG1vY2tfcmV0dXJucyhyZXR1cm5fdmFsdWVzKToKKyAgICAgICAgICAgIGRlZiByZXR1cm5f dmFsdWVfdGh1bmsoKmFyZ3MsICoqa3dhcmdzKToKKyAgICAgICAgICAgICAgICByZXR1cm4gcmV0 dXJuX3ZhbHVlcy5wb3AoMCkKKyAgICAgICAgICAgIHJldHVybiByZXR1cm5fdmFsdWVfdGh1bmsK KworICAgICAgICBob3N0LmV4ZWN1dGl2ZS5jaGVja19ydW5uaW5nX3BpZCA9IG1vY2tfcmV0dXJu cyhbVHJ1ZSwgRmFsc2VdKQorICAgICAgICBzZXJ2ZXIuX3dhaXRfZm9yX2FjdGlvbiA9IHdhaXRf Zm9yX2FjdGlvbgorCisgICAgICAgIHNlcnZlci5zdG9wKCkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoWyd0YXNra2lsbC5leGUnLCAnL2YnLCAnL3QnLCA0Ml0sIGhvc3QuZXhlY3V0aXZlLmNh bGxzWzFdKQo=