48053 2010-10-21 02:42:21 -0700 Make http locking default in NRWT 2010-11-17 07:58:45 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 48248 48321 48515 49164 49187 1 rgabor webkit-unassigned abecsi dglazkov dpranke eric ojan ossy tony oldest_to_newest 297317 0 rgabor 2010-10-21 02:42:21 -0700 The http locking should be default in NRWT. 297330 1 71413 rgabor 2010-10-21 03:10:46 -0700 Created attachment 71413 proposed patch 297452 2 71413 ojan 2010-10-21 09:01:44 -0700 Comment on attachment 71413 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=71413&action=review Should we remove start/stop server calls from run_webkit_tests.py as well? Seems like we should only need to do this in dump_render_tree_thread, right? > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:587 > + def start_servers_to_lock(self): > + self.start_http_server() > + self.start_websocket_server() > + > + def stop_servers_to_lock(self): > + self.stop_http_server() > + self.stop_websocket_server() Can we move the acquire_http_lock and release_http_lock calls into these functions? And maybe rename them to start_servers_with_lock/stop_servers_with_lock? 297779 3 71413 dpranke 2010-10-21 18:34:07 -0700 Comment on attachment 71413 proposed patch we also need to preserve some equivalent level of logging ... we need to be able to tell when the servers are started and stopped, at least at the debug level. It would be nice if we could preserve the print_update() status messages as well, but that's not really compatible with the one-line-status mode of running and starting the server while we're running other tests ... 297866 4 71535 rgabor 2010-10-22 01:21:19 -0700 Created attachment 71535 proposed_patch_v2 I made the changes what Ojan ask for and put some debug message to the start/stop methods. 297979 5 71535 ojan 2010-10-22 08:13:04 -0700 Comment on attachment 71535 proposed_patch_v2 Code looks fine. I think it would be clearer if there were just two methods: _start_servers_with_lock and _stop_servers_with_lock and those two methods contained all the logic. So, I would merge _stop_http_lock into _stop_servers_with_lock and the logic of lines 401-404 into _start_servers_with_lock. Then the if statement would look like this: if self._current_group == "tests_to_http_lock": self._start_servers_with_lock() elif self._have_http_lock: self._stop_servers_with_lock() 298105 6 dpranke 2010-10-22 12:04:48 -0700 Patch looks good to me as well with Ojan's suggestion rolled in. Thanks for all your work on this! 298753 7 ossy 2010-10-25 00:57:45 -0700 Modified patch landed in http://trac.webkit.org/changeset/70442 298754 8 71535 ossy 2010-10-25 00:58:08 -0700 Comment on attachment 71535 proposed_patch_v2 remove r+ from landed patch 298898 9 ossy 2010-10-25 09:11:30 -0700 Unfortunately it broke Windows bots on http://build.chromium.org/buildbot/waterfall.fyi/console Traceback (most recent call last): File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-tests", line 38, in <module> sys.exit(run_webkit_tests.main()) File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 1714, in main return run(port_obj, options, args) File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 1408, in run num_unexpected_results = test_runner.run(result_summary) File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 766, in run self._run_tests(self._test_files_list, result_summary)) File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 646, in _run_tests result_summary) File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 324, in _covered_run self._run(test_runner=None, result_summary=None) File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 401, in _run self._start_servers_with_lock() File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 554, in _start_servers_with_lock self._port.acquire_http_lock() File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\base.py", line 557, in acquire_http_lock self._http_lock.wait_for_httpd_lock() File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_lock.py", line 123, in wait_for_httpd_lock self._create_lock_file() File "c:\b\slave\webkit-rel-webkit-org\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_lock.py", line 108, in _create_lock_file os.O_CREAT | os.O_NONBLOCK | os.O_EXCL) AttributeError: 'module' object has no attribute 'O_NONBLOCK' 298903 10 ossy 2010-10-25 09:14:53 -0700 r70442 was rolled out by http://trac.webkit.org/changeset/70458. Gábor, could you file a new bug against http_lock.py, which blocks this bug? 300364 11 ossy 2010-10-27 10:54:29 -0700 (In reply to comment #10) > r70442 was rolled out by http://trac.webkit.org/changeset/70458. > > Gábor, could you file a new bug against http_lock.py, which blocks this bug? HTTP locking for Windows is fixed in https://bugs.webkit.org/show_bug.cgi?id=48321 I'm going to re-land r70442 and watch Windows bots. 300370 12 ossy 2010-10-27 11:03:46 -0700 (In reply to comment #11) > I'm going to re-land r70442 and watch Windows bots. Landed in http://trac.webkit.org/changeset/70674 300420 13 dglazkov 2010-10-27 11:57:51 -0700 (In reply to comment #12) > (In reply to comment #11) > > I'm going to re-land r70442 and watch Windows bots. > > Landed in http://trac.webkit.org/changeset/70674 Still broke the Chromium build. This time, it hung indefinitely: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win/builds/372/steps/webkit_tests/logs/stdio 300421 14 dglazkov 2010-10-27 11:58:30 -0700 Reverted r70674 for reason: Broke Chromium Windows build. Committed r70683: <http://trac.webkit.org/changeset/70683> 300437 15 ossy 2010-10-27 12:22:52 -0700 (In reply to comment #14) > Reverted r70674 for reason: > > Broke Chromium Windows build. > > Committed r70683: <http://trac.webkit.org/changeset/70683> Sorry for broken bot and thanks for roll-out. :(( We are going to fix it tomorrow. 301006 16 rgabor 2010-10-28 05:37:33 -0700 (In reply to comment #13) > (In reply to comment #12) > > (In reply to comment #11) > > > I'm going to re-land r70442 and watch Windows bots. > > > > Landed in http://trac.webkit.org/changeset/70674 > > Still broke the Chromium build. This time, it hung indefinitely: > > http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win/builds/372/steps/webkit_tests/logs/stdio That's strange, maybe there is a stuck lock file in the Windows temp directory. We tried it on Windows and it's worked for us, so can you check whether there is any WebKitHttpd.lock or WebKit.lock file in the temp directory. Anyway I will file a bug to clear the lock file if it's not valid on Windows platform as well. 304716 17 ossy 2010-11-04 09:48:51 -0700 Depending bug fixed: [NRWT] Clear invalid http locks on Windows platform as well - https://bugs.webkit.org/show_bug.cgi?id=48515 Let's try to enable http locking again: http://trac.webkit.org/changeset/71340 304730 18 ossy 2010-11-04 10:16:29 -0700 (In reply to comment #17) > Depending bug fixed: [NRWT] Clear invalid http locks on Windows platform as well - https://bugs.webkit.org/show_bug.cgi?id=48515 > > Let's try to enable http locking again: http://trac.webkit.org/changeset/71340 It broke Chromium Windows bot again: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win/builds/777/steps/webkit_tests/logs/stdio Rollout patch landed in http://trac.webkit.org/changeset/71342 306156 19 ossy 2010-11-08 09:18:14 -0800 Depending bug fixed: [NRWT] If the http lock fails we shouldn't do any locking - https://bugs.webkit.org/show_bug.cgi?id=49164 http locking is enabled by http://trac.webkit.org/changeset/71527 310287 20 ossy 2010-11-17 07:58:45 -0800 The last blocker https://bugs.webkit.org/show_bug.cgi?id=49187 was fixed by http://trac.webkit.org/changeset/72194 , so we can close this bug. 71413 2010-10-21 03:10:46 -0700 2010-10-22 01:21:19 -0700 proposed patch default_http_lock.patch text/plain 5449 rgabor SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwMjE4KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMjEgIEdhYm9yIFJhcGNzYW55aSAg PHJnYWJvckBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSBodHRwIGxvY2tpbmcgZGVmYXVsdCBpbiBOUldULgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgwNTMKKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBf cmVuZGVyX3RyZWVfdGhyZWFkLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorCiAyMDEwLTEwLTIxICBHYWJvciBSYXBjc2FueWkg IDxyZ2Fib3JAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFm YWkuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlzaW9uIDcwMjE4KQorKysg V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 cy5weQkod29ya2luZyBjb3B5KQpAQCAtNzQwLDE3ICs3NDAsNiBAQCBjbGFzcyBUZXN0UnVubmVy OgogICAgICAgICBpZiBub3QgcmVzdWx0X3N1bW1hcnk6CiAgICAgICAgICAgICByZXR1cm4gTm9u ZQogCi0gICAgICAgICMgRG8gbm90IHN0YXJ0IHdoZW4gaHR0cCBsb2NraW5nIGlzIGVuYWJsZWQu Ci0gICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLndhaXRfZm9yX2h0dHBkOgotICAgICAgICAg ICAgaWYgc2VsZi5uZWVkc19odHRwKCk6Ci0gICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5w cmludF91cGRhdGUoJ1N0YXJ0aW5nIEhUVFAgc2VydmVyIC4uLicpCi0gICAgICAgICAgICAgICAg c2VsZi5fcG9ydC5zdGFydF9odHRwX3NlcnZlcigpCi0KLSAgICAgICAgICAgIGlmIHNlbGYubmVl ZHNfd2Vic29ja2V0KCk6Ci0gICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF91cGRh dGUoJ1N0YXJ0aW5nIFdlYlNvY2tldCBzZXJ2ZXIgLi4uJykKLSAgICAgICAgICAgICAgICBzZWxm Ll9wb3J0LnN0YXJ0X3dlYnNvY2tldF9zZXJ2ZXIoKQotICAgICAgICAgICAgICAgICMgc2VsZi5f d2Vic29ja2V0X3NlY3VyZV9zZXJ2ZXIuU3RhcnQoKQotCiAgICAgICAgIHJldHVybiByZXN1bHRf c3VtbWFyeQogCiAgICAgZGVmIHJ1bihzZWxmLCByZXN1bHRfc3VtbWFyeSk6CkBAIC04NDAsMTEg KzgyOSw2IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIHN5cy5zdGRvdXQuZmx1c2goKQog ICAgICAgICBfbG9nLmRlYnVnKCJmbHVzaGluZyBzdGRlcnIiKQogICAgICAgICBzeXMuc3RkZXJy LmZsdXNoKCkKLSAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMud2FpdF9mb3JfaHR0cGQ6Ci0g ICAgICAgICAgICBfbG9nLmRlYnVnKCJzdG9wcGluZyBodHRwIHNlcnZlciIpCi0gICAgICAgICAg ICBzZWxmLl9wb3J0LnN0b3BfaHR0cF9zZXJ2ZXIoKQotICAgICAgICAgICAgX2xvZy5kZWJ1Zygi c3RvcHBpbmcgd2Vic29ja2V0IHNlcnZlciIpCi0gICAgICAgICAgICBzZWxmLl9wb3J0LnN0b3Bf d2Vic29ja2V0X3NlcnZlcigpCiAgICAgICAgIF9sb2cuZGVidWcoInN0b3BwaW5nIGhlbHBlciIp CiAgICAgICAgIHNlbGYuX3BvcnQuc3RvcF9oZWxwZXIoKQogCkBAIC0xNjAxLDkgKzE1ODUsNiBA QCBkZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlv bigiLS1uby1yZWNvcmQtcmVzdWx0cyIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLAogICAgICAgICAg ICAgZGVmYXVsdD1UcnVlLCBkZXN0PSJyZWNvcmRfcmVzdWx0cyIsCiAgICAgICAgICAgICBoZWxw PSJEb24ndCByZWNvcmQgdGhlIHJlc3VsdHMuIiksCi0gICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCItLXdhaXQtZm9yLWh0dHBkIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwKLSAgICAgICAgICAg IGRlZmF1bHQ9RmFsc2UsIGRlc3Q9IndhaXRfZm9yX2h0dHBkIiwKLSAgICAgICAgICAgIGhlbHA9 IldhaXQgZm9yIGh0dHAgbG9ja3MuIiksCiAgICAgICAgICMgb2xkLXJ1bi13ZWJraXQtdGVzdHMg YWxzbyBoYXMgSFRUUCB0b2dnbGUgb3B0aW9uczoKICAgICAgICAgIyAtLVtuby1daHR0cCAgICAg ICAgICAgICAgICAgICAgIFJ1biAob3IgZG8gbm90IHJ1bikgaHR0cCB0ZXN0cwogICAgICAgICAj ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGRlZmF1bHQ6IHJ1bikKSW5kZXg6IFdl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1 bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVf dGhyZWFkLnB5CShyZXZpc2lvbiA3MDIxOCkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0zOTcsMTggKzM5NywxNiBAQCBjbGFzcyBUZXN0U2hlbGxUaHJl YWQoV2F0Y2hhYmxlVGhyZWFkKToKICAgICAgICAgICAgICAgICAgICAgdGVzdHNfcnVuX2ZpbGUu Y2xvc2UoKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4KIAotICAgICAgICAgICAgICAgIGlm IHNlbGYuX29wdGlvbnMud2FpdF9mb3JfaHR0cGQ6Ci0gICAgICAgICAgICAgICAgICAgIGlmIHNl bGYuX2N1cnJlbnRfZ3JvdXAgPT0gInRlc3RzX3RvX2h0dHBfbG9jayI6Ci0gICAgICAgICAgICAg ICAgICAgICAgICBzZWxmLl9odHRwX2xvY2tfd2FpdF9iZWdpbiA9IHRpbWUudGltZSgpCi0gICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LmFjcXVpcmVfaHR0cF9sb2NrKCkKLQotICAg ICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcG9ydC5zdGFydF9odHRwX3NlcnZlcigpCi0gICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LnN0YXJ0X3dlYnNvY2tldF9zZXJ2ZXIoKQot Ci0gICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9oYXZlX2h0dHBfbG9jayA9IFRydWUKLSAg ICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX2h0dHBfbG9ja193YWl0X2VuZCA9IHRpbWUudGlt ZSgpCi0gICAgICAgICAgICAgICAgICAgIGVsaWYgc2VsZi5faGF2ZV9odHRwX2xvY2s6Ci0gICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLl9zdG9wX2h0dHBfbG9jaygpCisgICAgICAgICAgICAg ICAgaWYgc2VsZi5fY3VycmVudF9ncm91cCA9PSAidGVzdHNfdG9faHR0cF9sb2NrIjoKKyAgICAg ICAgICAgICAgICAgICAgc2VsZi5faHR0cF9sb2NrX3dhaXRfYmVnaW4gPSB0aW1lLnRpbWUoKQor ICAgICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LmFjcXVpcmVfaHR0cF9sb2NrKCkKKworICAg ICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LnN0YXJ0X3NlcnZlcnNfdG9fbG9jaygpCisKKyAg ICAgICAgICAgICAgICAgICAgc2VsZi5faGF2ZV9odHRwX2xvY2sgPSBUcnVlCisgICAgICAgICAg ICAgICAgICAgIHNlbGYuX2h0dHBfbG9ja193YWl0X2VuZCA9IHRpbWUudGltZSgpCisgICAgICAg ICAgICAgICAgZWxpZiBzZWxmLl9oYXZlX2h0dHBfbG9jazoKKyAgICAgICAgICAgICAgICAgICAg c2VsZi5fc3RvcF9odHRwX2xvY2soKQogCiAgICAgICAgICAgICAgICAgc2VsZi5fbnVtX3Rlc3Rz X2luX2N1cnJlbnRfZ3JvdXAgPSBsZW4oc2VsZi5fZmlsZW5hbWVfbGlzdCkKICAgICAgICAgICAg ICAgICBzZWxmLl9jdXJyZW50X2dyb3VwX3N0YXJ0X3RpbWUgPSB0aW1lLnRpbWUoKQpAQCAtNTU4 LDggKzU1Niw3IEBAIGNsYXNzIFRlc3RTaGVsbFRocmVhZChXYXRjaGFibGVUaHJlYWQpOgogICAg IGRlZiBfc3RvcF9odHRwX2xvY2soc2VsZik6CiAgICAgICAgICIiIlN0b3AgdGhlIHNlcnZlcnMg YW5kIHJlbGVhc2UgaHR0cCBsb2NrLiIiIgogICAgICAgICBpZiBzZWxmLl9oYXZlX2h0dHBfbG9j azoKLSAgICAgICAgICAgIHNlbGYuX3BvcnQuc3RvcF9odHRwX3NlcnZlcigpCi0gICAgICAgICAg ICBzZWxmLl9wb3J0LnN0b3Bfd2Vic29ja2V0X3NlcnZlcigpCisgICAgICAgICAgICBzZWxmLl9w b3J0LnN0b3Bfc2VydmVyc190b19sb2NrKCkKICAgICAgICAgICAgIHNlbGYuX3BvcnQucmVsZWFz ZV9odHRwX2xvY2soKQogICAgICAgICAgICAgc2VsZi5faGF2ZV9odHRwX2xvY2sgPSBGYWxzZQog CkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jh c2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiA3MDIxOCkKKysrIFdlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAt NTc4LDYgKzU3OCwxNCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIGlmIHNlbGYuX2h0 dHBfbG9jazoKICAgICAgICAgICAgIHNlbGYuX2h0dHBfbG9jay5jbGVhbnVwX2h0dHBfbG9jaygp CiAKKyAgICBkZWYgc3RhcnRfc2VydmVyc190b19sb2NrKHNlbGYpOgorICAgICAgICBzZWxmLnN0 YXJ0X2h0dHBfc2VydmVyKCkKKyAgICAgICAgc2VsZi5zdGFydF93ZWJzb2NrZXRfc2VydmVyKCkK KworICAgIGRlZiBzdG9wX3NlcnZlcnNfdG9fbG9jayhzZWxmKToKKyAgICAgICAgc2VsZi5zdG9w X2h0dHBfc2VydmVyKCkKKyAgICAgICAgc2VsZi5zdG9wX3dlYnNvY2tldF9zZXJ2ZXIoKQorCiAg ICAgZGVmIHRlc3RfZXhwZWN0YXRpb25zKHNlbGYpOgogICAgICAgICAiIiJSZXR1cm5zIHRoZSB0 ZXN0IGV4cGVjdGF0aW9ucyBmb3IgdGhpcyBwb3J0LgogCg== 71535 2010-10-22 01:21:19 -0700 2010-10-25 00:58:08 -0700 proposed_patch_v2 default_http_lock2.patch text/plain 5380 rgabor SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwMjk0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMTAtMjIgIEdhYm9yIFJhcGNzYW55aSAg PHJnYWJvckBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSBodHRwIGxvY2tpbmcgZGVmYXVsdCBpbiBOUldULgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgwNTMKKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBf cmVuZGVyX3RyZWVfdGhyZWFkLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisKIDIwMTAtMTAtMjEgIE1PUklUQSBIYWppbWUg IDxtb3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBUYW11cmEu CkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlzaW9uIDcwMjk0KQorKysgV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQkod29ya2luZyBjb3B5KQpAQCAtNzQwLDE3ICs3NDAsNiBAQCBjbGFzcyBUZXN0UnVubmVyOgog ICAgICAgICBpZiBub3QgcmVzdWx0X3N1bW1hcnk6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQog Ci0gICAgICAgICMgRG8gbm90IHN0YXJ0IHdoZW4gaHR0cCBsb2NraW5nIGlzIGVuYWJsZWQuCi0g ICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLndhaXRfZm9yX2h0dHBkOgotICAgICAgICAgICAg aWYgc2VsZi5uZWVkc19odHRwKCk6Ci0gICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF91cGRhdGUoJ1N0YXJ0aW5nIEhUVFAgc2VydmVyIC4uLicpCi0gICAgICAgICAgICAgICAgc2Vs Zi5fcG9ydC5zdGFydF9odHRwX3NlcnZlcigpCi0KLSAgICAgICAgICAgIGlmIHNlbGYubmVlZHNf d2Vic29ja2V0KCk6Ci0gICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF91cGRhdGUo J1N0YXJ0aW5nIFdlYlNvY2tldCBzZXJ2ZXIgLi4uJykKLSAgICAgICAgICAgICAgICBzZWxmLl9w b3J0LnN0YXJ0X3dlYnNvY2tldF9zZXJ2ZXIoKQotICAgICAgICAgICAgICAgICMgc2VsZi5fd2Vi c29ja2V0X3NlY3VyZV9zZXJ2ZXIuU3RhcnQoKQotCiAgICAgICAgIHJldHVybiByZXN1bHRfc3Vt bWFyeQogCiAgICAgZGVmIHJ1bihzZWxmLCByZXN1bHRfc3VtbWFyeSk6CkBAIC04NDAsMTEgKzgy OSw2IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIHN5cy5zdGRvdXQuZmx1c2goKQogICAg ICAgICBfbG9nLmRlYnVnKCJmbHVzaGluZyBzdGRlcnIiKQogICAgICAgICBzeXMuc3RkZXJyLmZs dXNoKCkKLSAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMud2FpdF9mb3JfaHR0cGQ6Ci0gICAg ICAgICAgICBfbG9nLmRlYnVnKCJzdG9wcGluZyBodHRwIHNlcnZlciIpCi0gICAgICAgICAgICBz ZWxmLl9wb3J0LnN0b3BfaHR0cF9zZXJ2ZXIoKQotICAgICAgICAgICAgX2xvZy5kZWJ1Zygic3Rv cHBpbmcgd2Vic29ja2V0IHNlcnZlciIpCi0gICAgICAgICAgICBzZWxmLl9wb3J0LnN0b3Bfd2Vi c29ja2V0X3NlcnZlcigpCiAgICAgICAgIF9sb2cuZGVidWcoInN0b3BwaW5nIGhlbHBlciIpCiAg ICAgICAgIHNlbGYuX3BvcnQuc3RvcF9oZWxwZXIoKQogCkBAIC0xNjAyLDkgKzE1ODYsNiBAQCBk ZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigi LS1uby1yZWNvcmQtcmVzdWx0cyIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLAogICAgICAgICAgICAg ZGVmYXVsdD1UcnVlLCBkZXN0PSJyZWNvcmRfcmVzdWx0cyIsCiAgICAgICAgICAgICBoZWxwPSJE b24ndCByZWNvcmQgdGhlIHJlc3VsdHMuIiksCi0gICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9u KCItLXdhaXQtZm9yLWh0dHBkIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwKLSAgICAgICAgICAgIGRl ZmF1bHQ9RmFsc2UsIGRlc3Q9IndhaXRfZm9yX2h0dHBkIiwKLSAgICAgICAgICAgIGhlbHA9Ildh aXQgZm9yIGh0dHAgbG9ja3MuIiksCiAgICAgICAgICMgb2xkLXJ1bi13ZWJraXQtdGVzdHMgYWxz byBoYXMgSFRUUCB0b2dnbGUgb3B0aW9uczoKICAgICAgICAgIyAtLVtuby1daHR0cCAgICAgICAg ICAgICAgICAgICAgIFJ1biAob3IgZG8gbm90IHJ1bikgaHR0cCB0ZXN0cwogICAgICAgICAjICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGRlZmF1bHQ6IHJ1bikKSW5kZXg6IFdlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBf cmVuZGVyX3RyZWVfdGhyZWFkLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhy ZWFkLnB5CShyZXZpc2lvbiA3MDI5NCkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0zOTcsMTggKzM5NywxMyBAQCBjbGFzcyBUZXN0U2hlbGxUaHJlYWQo V2F0Y2hhYmxlVGhyZWFkKToKICAgICAgICAgICAgICAgICAgICAgdGVzdHNfcnVuX2ZpbGUuY2xv c2UoKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4KIAotICAgICAgICAgICAgICAgIGlmIHNl bGYuX29wdGlvbnMud2FpdF9mb3JfaHR0cGQ6Ci0gICAgICAgICAgICAgICAgICAgIGlmIHNlbGYu X2N1cnJlbnRfZ3JvdXAgPT0gInRlc3RzX3RvX2h0dHBfbG9jayI6Ci0gICAgICAgICAgICAgICAg ICAgICAgICBzZWxmLl9odHRwX2xvY2tfd2FpdF9iZWdpbiA9IHRpbWUudGltZSgpCi0gICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LmFjcXVpcmVfaHR0cF9sb2NrKCkKLQotICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZi5fcG9ydC5zdGFydF9odHRwX3NlcnZlcigpCi0gICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LnN0YXJ0X3dlYnNvY2tldF9zZXJ2ZXIoKQotCi0g ICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9oYXZlX2h0dHBfbG9jayA9IFRydWUKLSAgICAg ICAgICAgICAgICAgICAgICAgIHNlbGYuX2h0dHBfbG9ja193YWl0X2VuZCA9IHRpbWUudGltZSgp Ci0gICAgICAgICAgICAgICAgICAgIGVsaWYgc2VsZi5faGF2ZV9odHRwX2xvY2s6Ci0gICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLl9zdG9wX2h0dHBfbG9jaygpCisgICAgICAgICAgICAgICAg aWYgc2VsZi5fY3VycmVudF9ncm91cCA9PSAidGVzdHNfdG9faHR0cF9sb2NrIjoKKyAgICAgICAg ICAgICAgICAgICAgc2VsZi5faHR0cF9sb2NrX3dhaXRfYmVnaW4gPSB0aW1lLnRpbWUoKQorICAg ICAgICAgICAgICAgICAgICBzZWxmLl9zdGFydF9zZXJ2ZXJzX3dpdGhfbG9jaygpCisgICAgICAg ICAgICAgICAgICAgIHNlbGYuX2hhdmVfaHR0cF9sb2NrID0gVHJ1ZQorICAgICAgICAgICAgICAg ICAgICBzZWxmLl9odHRwX2xvY2tfd2FpdF9lbmQgPSB0aW1lLnRpbWUoKQorICAgICAgICAgICAg ICAgIGVsaWYgc2VsZi5faGF2ZV9odHRwX2xvY2s6CisgICAgICAgICAgICAgICAgICAgIHNlbGYu X3N0b3BfaHR0cF9sb2NrKCkKIAogICAgICAgICAgICAgICAgIHNlbGYuX251bV90ZXN0c19pbl9j dXJyZW50X2dyb3VwID0gbGVuKHNlbGYuX2ZpbGVuYW1lX2xpc3QpCiAgICAgICAgICAgICAgICAg c2VsZi5fY3VycmVudF9ncm91cF9zdGFydF90aW1lID0gdGltZS50aW1lKCkKQEAgLTU1NSwxMiAr NTUwLDI2IEBAIGNsYXNzIFRlc3RTaGVsbFRocmVhZChXYXRjaGFibGVUaHJlYWQpOgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX29wdGlv bnMpCiAgICAgICAgICAgICBzZWxmLl9kcml2ZXIuc3RhcnQoKQogCisgICAgZGVmIF9zdGFydF9z ZXJ2ZXJzX3dpdGhfbG9jayhzZWxmKToKKyAgICAgICAgX2xvZy5kZWJ1ZygnQWNxdWlyZSBodHRw IGxvY2sgLi4uJykKKyAgICAgICAgc2VsZi5fcG9ydC5hY3F1aXJlX2h0dHBfbG9jaygpCisgICAg ICAgIF9sb2cuZGVidWcoJ1N0YXJ0aW5nIEhUVFAgc2VydmVyIC4uLicpCisgICAgICAgIHNlbGYu X3BvcnQuc3RhcnRfaHR0cF9zZXJ2ZXIoKQorICAgICAgICBfbG9nLmRlYnVnKCdTdGFydGluZyBX ZWJTb2NrZXQgc2VydmVyIC4uLicpCisgICAgICAgIHNlbGYuX3BvcnQuc3RhcnRfd2Vic29ja2V0 X3NlcnZlcigpCisKKyAgICBkZWYgX3N0b3Bfc2VydmVyc193aXRoX2xvY2soc2VsZik6CisgICAg ICAgIF9sb2cuZGVidWcoJ1N0b3BwaW5nIEhUVFAgc2VydmVyIC4uLicpCisgICAgICAgIHNlbGYu X3BvcnQuc3RvcF9odHRwX3NlcnZlcigpCisgICAgICAgIF9sb2cuZGVidWcoJ1N0b3BwaW5nIFdl YlNvY2tldCBzZXJ2ZXIgLi4uJykKKyAgICAgICAgc2VsZi5fcG9ydC5zdG9wX3dlYnNvY2tldF9z ZXJ2ZXIoKQorICAgICAgICBfbG9nLmRlYnVnKCdSZWxlYXNlIGh0dHAgbG9jayAuLi4nKQorICAg ICAgICBzZWxmLl9wb3J0LnJlbGVhc2VfaHR0cF9sb2NrKCkKKwogICAgIGRlZiBfc3RvcF9odHRw X2xvY2soc2VsZik6CiAgICAgICAgICIiIlN0b3AgdGhlIHNlcnZlcnMgYW5kIHJlbGVhc2UgaHR0 cCBsb2NrLiIiIgogICAgICAgICBpZiBzZWxmLl9oYXZlX2h0dHBfbG9jazoKLSAgICAgICAgICAg IHNlbGYuX3BvcnQuc3RvcF9odHRwX3NlcnZlcigpCi0gICAgICAgICAgICBzZWxmLl9wb3J0LnN0 b3Bfd2Vic29ja2V0X3NlcnZlcigpCi0gICAgICAgICAgICBzZWxmLl9wb3J0LnJlbGVhc2VfaHR0 cF9sb2NrKCkKKyAgICAgICAgICAgIHNlbGYuX3N0b3Bfc2VydmVyc193aXRoX2xvY2soKQogICAg ICAgICAgICAgc2VsZi5faGF2ZV9odHRwX2xvY2sgPSBGYWxzZQogCiAgICAgZGVmIF9raWxsX2R1 bXBfcmVuZGVyX3RyZWUoc2VsZik6Cg==