61847 2011-06-01 01:48:01 -0700 Worker may not be stopped after LT. 2011-06-03 12:44:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61965 1 zhenghao dpranke abarth commit-queue dpranke tony oldest_to_newest 413231 0 zhenghao 2011-06-01 01:48:01 -0700 In worker.py, only call to cleanup() is in __del__, which is not guaranteed to be called when the python interpreter exits. And self._driver is not killed after LT. After many runs of LT, there will be many zombie processes of driver. I think we need to run cleanup() explicitly for worker. I'm not sure where is better to put cleanup(): def handle_stop(self, src): self._done = True ** self.cleanup() Or, def run(self, port): self.safe_init(port) exception_msg = "" _log.debug("%s starting" % self._name) try: self._worker_connection.run_message_loop() if not self.is_done(): raise AssertionError("%s: ran out of messages in worker queue." % self._name) except KeyboardInterrupt: exception_msg = ", interrupted" except: exception_msg = ", exception raised" finally: _log.debug("%s done%s" % (self._name, exception_msg)) if exception_msg: exception_type, exception_value, exception_traceback = sys.exc_info() stack_utils.log_traceback(_log.debug, exception_traceback) # FIXME: Figure out how to send a message with a traceback. self._worker_connection.post_message('exception', (exception_type, exception_value, None)) self._worker_connection.post_message('done') ** self.cleanup() I'd like to hear your comments. 413475 1 dpranke 2011-06-01 10:34:28 -0700 cleanup() should be getting called at the end of run(). I'm pretty sure it did at some point; I wonder if I deleted it? Feel free to add a patch for this, or I'll do so this afternoon. 413884 2 95716 zhenghao 2011-06-01 21:15:49 -0700 Created attachment 95716 Proposed patch. 414366 3 commit-queue 2011-06-02 12:58:55 -0700 The commit-queue encountered the following flaky tests while processing attachment 95716: fast/history/history-subframe-with-name.html bug 51039 (author: mihaip@chromium.org) http/tests/websocket/tests/error-detect.html bug 54012 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 414371 4 95716 commit-queue 2011-06-02 13:01:14 -0700 Comment on attachment 95716 Proposed patch. Clearing flags on attachment: 95716 Committed r87946: <http://trac.webkit.org/changeset/87946> 414372 5 commit-queue 2011-06-02 13:01:18 -0700 All reviewed patches have been landed. Closing bug. 414458 6 abarth 2011-06-02 14:40:34 -0700 This broke NRWT in multiple configurations. Here's an example: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Linux%20%28dbg%29%281%29/builds/6754/steps/webkit_tests/logs/stdio 2011-06-02 13:35:14,919 8291 manager.py:672 DEBUG No wedged threads 2011-06-02 13:35:15,419 8291 manager.py:690 INFO Exception raised, exiting Traceback (most recent call last): File "/mnt/data/b/build/slave/Webkit_Linux__dbg__1_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 460, in <module> sys.exit(main()) File "/mnt/data/b/build/slave/Webkit_Linux__dbg__1_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 455, in main return run(port_obj, options, args) File "/mnt/data/b/build/slave/Webkit_Linux__dbg__1_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 118, in run num_unexpected_results = manager.run(result_summary) File "/mnt/data/b/build/slave/Webkit_Linux__dbg__1_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py", line 779, in run self._run_tests(self._test_files_list, result_summary)) File "/mnt/data/b/build/slave/Webkit_Linux__dbg__1_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py", line 678, in _run_tests assert not worker_state.worker_connection.is_alive() AssertionError program finished with exit code 1 414604 7 95845 dpranke 2011-06-02 19:17:46 -0700 Created attachment 95845 Patch 414622 8 zhenghao 2011-06-02 20:13:12 -0700 Thanks for your help. Sorry to break the bots. 414962 9 95845 tony 2011-06-03 09:53:28 -0700 Comment on attachment 95845 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95845&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:681 > + _log.error('Worked %d did not exit in time. Aborting.' % worker_state.number) > + raise AssertionError('Worker %d did not exit in time' % worker_state.number) Should we raise an Assertion here or just log the error and try to keep going? > Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py:150 > + self.kill_driver() > + self.stop_servers_with_lock() Nit: We may want to remove the _driver and _has_http_lock checks in the other call sites (in a separate patch). 414969 10 dpranke 2011-06-03 10:01:43 -0700 (In reply to comment #9) > (From update of attachment 95845 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95845&action=review > > > Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:681 > > + _log.error('Worked %d did not exit in time. Aborting.' % worker_state.number) > > + raise AssertionError('Worker %d did not exit in time' % worker_state.number) > > Should we raise an Assertion here or just log the error and try to keep going? > Good question. I'm not actually sure what the end result of the run will be in either case (hung process or process that eventually exits when the slow thread/process exits). I would prefer to leave it as an assertion for now just to help identify if it actually occurs. > > Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py:150 > > + self.kill_driver() > > + self.stop_servers_with_lock() > > Nit: We may want to remove the _driver and _has_http_lock checks in the other call sites (in a separate patch). will do. 415027 11 95845 tony 2011-06-03 11:29:41 -0700 Comment on attachment 95845 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95845&action=review >>> Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:681 >>> + raise AssertionError('Worker %d did not exit in time' % worker_state.number) >> >> Should we raise an Assertion here or just log the error and try to keep going? > > Good question. I'm not actually sure what the end result of the run will be in either case (hung process or process that eventually exits when the slow thread/process exits). I would prefer to leave it as an assertion for now just to help identify if it actually occurs. I think this is OK, but In general I think we should try to have the bots keep going as much as possible. If the script crashes, it causes problems for the gardener who then needs to rollback and wait for the bots to cycle an extra time. The downside for you is much smaller: you just need to land the patch manually and watch the bots as they cycle to see if an error is logged. You might want to try landing this during non-busy hours or coordinate the landing with the gardener. 415095 12 dpranke 2011-06-03 12:32:23 -0700 (In reply to comment #11) > (From update of attachment 95845 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95845&action=review > > >>> Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:681 > >>> + raise AssertionError('Worker %d did not exit in time' % worker_state.number) > >> > >> Should we raise an Assertion here or just log the error and try to keep going? > > > > Good question. I'm not actually sure what the end result of the run will be in either case (hung process or process that eventually exits when the slow thread/process exits). I would prefer to leave it as an assertion for now just to help identify if it actually occurs. > > I think this is OK, but In general I think we should try to have the bots keep going as much as possible. If the script crashes, it causes problems for the gardener who then needs to rollback and wait for the bots to cycle an extra time. The downside for you is much smaller: you just need to land the patch manually and watch the bots as they cycle to see if an error is logged. > > You might want to try landing this during non-busy hours or coordinate the landing with the gardener. Oh, I'm not worried about this patch in particular being broken, I'm worried about something happening down the road that causes this to fail. That said, I just tested it, and raising the assert won't by itself cause the program to exit (since there are still child processes running), so there's not much effective difference here between asserting and logging an error. I'll change this to a log for now. There's also two typos in that line that are real bugs, so I'll post another patch that actually works :) 415097 13 95947 dpranke 2011-06-03 12:34:24 -0700 Created attachment 95947 Patch 415104 14 dpranke 2011-06-03 12:44:03 -0700 Committed r88040: <http://trac.webkit.org/changeset/88040> 95716 2011-06-01 21:15:49 -0700 2011-06-02 19:17:43 -0700 Proposed patch. worker_cleanup.patch text/plain 1508 zhenghao SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg3ODc2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTIgQEAKKzIwMTEtMDYtMDEgIEhhbyBaaGVuZyAgPHpoZW5naGFvQGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIGNs ZWFudXAoKSBleHBsaWNpdGx5IGF0IHRoZSBlbmQgb2Ygd29ya2VyLnJ1bigpLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE4NDcKKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3dvcmtlci5weToK KwogMjAxMS0wNi0wMSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvd29ya2VyLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3dvcmtlci5w eQkocmV2aXNpb24gODc4NzYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9sYXlvdXRfcGFja2FnZS93b3JrZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTExMCw2ICsxMTAs NyBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJfYnJva2VyLkFic3RyCiAgICAgICAgICAg ICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdleGNlcHRpb24nLAog ICAgICAgICAgICAgICAgICAgICAoZXhjZXB0aW9uX3R5cGUsIGV4Y2VwdGlvbl92YWx1ZSwgTm9u ZSkpCiAgICAgICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2Rv bmUnKQorICAgICAgICAgICAgc2VsZi5jbGVhbnVwKCkKIAogICAgIGRlZiBoYW5kbGVfdGVzdF9s aXN0KHNlbGYsIHNyYywgbGlzdF9uYW1lLCB0ZXN0X2xpc3QpOgogICAgICAgICBpZiBsaXN0X25h bWUgPT0gInRlc3RzX3RvX2h0dHBfbG9jayI6CkBAIC0xNDQsNiArMTQ1LDcgQEAgY2xhc3MgV29y a2VyKG1hbmFnZXJfd29ya2VyX2Jyb2tlci5BYnN0cgogICAgICAgICBzZWxmLmNsZWFuX3VwX2Fm dGVyX3Rlc3QodGVzdF9pbnB1dCwgcmVzdWx0KQogCiAgICAgZGVmIGNsZWFudXAoc2VsZik6Cisg ICAgICAgIF9sb2cuZGVidWcoIkNsZWFuaW5nIHVwICVzIiAlIHNlbGYuX25hbWUpCiAgICAgICAg IGlmIHNlbGYuX2RyaXZlcjoKICAgICAgICAgICAgIHNlbGYua2lsbF9kcml2ZXIoKQogICAgICAg ICBpZiBzZWxmLl9oYXNfaHR0cF9sb2NrOgo= 95845 2011-06-02 19:17:46 -0700 2011-06-03 12:34:21 -0700 Patch bug-61847-20110602191745.patch text/plain 3844 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODc5NjcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2YzNjZjViZmY1ZTQ2MjllY2QzY2I3MDI1NWZhMTdkZThl MDFlZDYwLi4yNDA1YWE1NDYyMzU5ZWNkNThlNjEzNzc0N2I2NThhOTgzNzU4YWNhIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTEtMDYtMDIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV29ya2VyIG1heSBu b3QgYmUgc3RvcHBlZCBhZnRlciBMVC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTYxODQ3CisKKyAgICAgICAgUmUtc3VibWl0IGEgdmFyaWFudCBvZiB0 aGUgZmlyc3QgZml4IGZvciB0aGlzIGJ1Zy4gSXQncyBwb3NzaWJsZQorICAgICAgICB0aGF0IGFj dHVhbGx5IGNhbGxpbmcgY2xlYW51cCgpIGluIHRoZSB3b3JrZXIgdGhyZWFkcyB3YXMgdGFraW5n CisgICAgICAgIHRvbyBsb25nIGFuZCB3ZSB0cmlnZ2VyZWQgdGhlIGFzc2VydGlvbnMgaW4gdGhl IG1hbmFnZXIgdGhyZWFkLgorCisgICAgICAgIEkndmUgYnVtcGVkIHVwIHRoZSB0aW1lb3V0IGlu IHRoZSBtYW5hZ2VyIGFuZCBhZGRlZCBiZXR0ZXIKKyAgICAgICAgZGlhZ25vc3RpY3MuIEkgYWxz byBjbGVhbmVkIHVwIHRoZSBjbGVhbnVwKCkgY29kZSBhIGJpdCBiZWNhdXNlCisgICAgICAgIHRo ZXJlIHdhcyBzb21lIHVubmVjZXNzYXJ5IGlmLWNoZWNrcy4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXIucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvd29ya2VyLnB5 OgorCisyMDExLTA2LTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCiAKICAgICAgICAgTlJXVCBuZWVkcyBhIHdh eSB0byBsb2cgdG8gYSBmaWxlIHdpdGhvdXQgaW5jbHVkaW5nIGJhY2tzcGFjZXMgd2l0aG91dCBu ZWVkaW5nIC0tdmVyYm9zZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXIucHkKaW5kZXggNzViY2UwZDA1 ZjQ5MTgyMmI5NTk0YjhjMDg1MzQwM2Q3ZTY3NWRkYi4uMjhlN2RjMTcwNWFjZGY2Y2FlZmExZjdh OTM5MDQzMTA3NDJhZjQ5ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tYW5hZ2VyLnB5CkBAIC02NzQsOCAr Njc0LDExIEBAIGNsYXNzIE1hbmFnZXI6CiAgICAgICAgICAgICAjIE1ha2Ugc3VyZSBhbGwgb2Yg dGhlIHdvcmtlcnMgaGF2ZSBzaHV0IGRvd24gKGlmIHBvc3NpYmxlKS4KICAgICAgICAgICAgIGZv ciB3b3JrZXJfc3RhdGUgaW4gc2VsZi5fd29ya2VyX3N0YXRlcy52YWx1ZXMoKToKICAgICAgICAg ICAgICAgICBpZiBub3Qgd29ya2VyX3N0YXRlLndlZGdlZCBhbmQgd29ya2VyX3N0YXRlLndvcmtl cl9jb25uZWN0aW9uLmlzX2FsaXZlKCk6Ci0gICAgICAgICAgICAgICAgICAgIHdvcmtlcl9zdGF0 ZS53b3JrZXJfY29ubmVjdGlvbi5qb2luKDAuNSkKLSAgICAgICAgICAgICAgICAgICAgYXNzZXJ0 IG5vdCB3b3JrZXJfc3RhdGUud29ya2VyX2Nvbm5lY3Rpb24uaXNfYWxpdmUoKQorICAgICAgICAg ICAgICAgICAgICBfbG9nLndhcm5pbmcoJ1dhaXRpbmcgZm9yIHdvcmtlciAlZCB0byBleGl0JyAl IHdvcmtlcl9zdGF0ZS5udW1iZXIpCisgICAgICAgICAgICAgICAgICAgIHdvcmtlcl9zdGF0ZS53 b3JrZXJfY29ubmVjdGlvbi5qb2luKDUuMCkKKyAgICAgICAgICAgICAgICAgICAgaWYgd29ya2Vy X3N0YXRlLndvcmtfY29ubmVjdGlvbi5pc19hbGl2ZToKKyAgICAgICAgICAgICAgICAgICAgICAg IF9sb2cuZXJyb3IoJ1dvcmtlZCAlZCBkaWQgbm90IGV4aXQgaW4gdGltZS4gQWJvcnRpbmcuJyAl IHdvcmtlcl9zdGF0ZS5udW1iZXIpCisgICAgICAgICAgICAgICAgICAgICAgICByYWlzZSBBc3Nl cnRpb25FcnJvcignV29ya2VyICVkIGRpZCBub3QgZXhpdCBpbiB0aW1lJyAlIHdvcmtlcl9zdGF0 ZS5udW1iZXIpCiAKICAgICAgICAgZXhjZXB0IEtleWJvYXJkSW50ZXJydXB0OgogICAgICAgICAg ICAgX2xvZy5pbmZvKCJJbnRlcnJ1cHRlZCwgZXhpdGluZyIpCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS93b3JrZXIucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS93b3JrZXIu cHkKaW5kZXggNmZmM2YxMjU4YTIwZTc5N2I1MTJkNmY1MjE5ZTk5NmViZTQzZjc4ZC4uZTk5ZWZh Mzk3YzkxMzA5MTRjNjE3MWY3ZTFiNTE5YmZkNTljMzA0MCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvd29ya2VyLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3dvcmtl ci5weQpAQCAtMTEwLDYgKzExMCw3IEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9r ZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0 aW9uLnBvc3RfbWVzc2FnZSgnZXhjZXB0aW9uJywKICAgICAgICAgICAgICAgICAgICAgKGV4Y2Vw dGlvbl90eXBlLCBleGNlcHRpb25fdmFsdWUsIE5vbmUpKQogICAgICAgICAgICAgc2VsZi5fd29y a2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdkb25lJykKKyAgICAgICAgICAgIHNlbGYuY2xl YW51cCgpCiAKICAgICBkZWYgaGFuZGxlX3Rlc3RfbGlzdChzZWxmLCBzcmMsIGxpc3RfbmFtZSwg dGVzdF9saXN0KToKICAgICAgICAgaWYgbGlzdF9uYW1lID09ICJ0ZXN0c190b19odHRwX2xvY2si OgpAQCAtMTQ0LDEzICsxNDUsMTMgQEAgY2xhc3MgV29ya2VyKG1hbmFnZXJfd29ya2VyX2Jyb2tl ci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAgIHNlbGYuY2xlYW5fdXBfYWZ0ZXJfdGVzdCh0ZXN0 X2lucHV0LCByZXN1bHQpCiAKICAgICBkZWYgY2xlYW51cChzZWxmKToKLSAgICAgICAgaWYgc2Vs Zi5fZHJpdmVyOgotICAgICAgICAgICAgc2VsZi5raWxsX2RyaXZlcigpCi0gICAgICAgIGlmIHNl bGYuX2hhc19odHRwX2xvY2s6Ci0gICAgICAgICAgICBzZWxmLnN0b3Bfc2VydmVyc193aXRoX2xv Y2soKQorICAgICAgICBfbG9nLmRlYnVnKCJjbGVhbmluZyB1cCIpCisgICAgICAgIHNlbGYua2ls bF9kcml2ZXIoKQorICAgICAgICBzZWxmLnN0b3Bfc2VydmVyc193aXRoX2xvY2soKQogICAgICAg ICBpZiBzZWxmLl90ZXN0c19ydW5fZmlsZToKICAgICAgICAgICAgIHNlbGYuX3Rlc3RzX3J1bl9m aWxlLmNsb3NlKCkKICAgICAgICAgICAgIHNlbGYuX3Rlc3RzX3J1bl9maWxlID0gTm9uZQorICAg ICAgICBfbG9nLmRlYnVnKCJkb25lIGNsZWFuaW5nIHVwIikKIAogICAgIGRlZiB0aW1lb3V0KHNl bGYsIHRlc3RfaW5wdXQpOgogICAgICAgICAiIiJDb21wdXRlIHRoZSBhcHByb3ByaWF0ZSB0aW1l b3V0IHZhbHVlIGZvciBhIHRlc3QuIiIiCg== 95947 2011-06-03 12:34:24 -0700 2011-06-03 12:42:17 -0700 Patch bug-61847-20110603123423.patch text/plain 3634 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODgwMzgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNTEwNjlkNmUxODllNGFiNThjOWViNTI4NDdkYWVlMGMy NzM3MTc0Li4yYjVlMjA5ZjNlNmI4MTFkODkzMWViZDAzN2NkMzUzNzcxNmQwZGY0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDYtMDIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV29ya2VyIG1heSBu b3QgYmUgc3RvcHBlZCBhZnRlciBMVC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTYxODQ3CisKKyAgICAgICAgUmUtc3VibWl0IGEgdmFyaWFudCBvZiB0 aGUgZmlyc3QgZml4IGZvciB0aGlzIGJ1Zy4gSXQncyBwb3NzaWJsZQorICAgICAgICB0aGF0IGFj dHVhbGx5IGNhbGxpbmcgY2xlYW51cCgpIGluIHRoZSB3b3JrZXIgdGhyZWFkcyB3YXMgdGFraW5n CisgICAgICAgIHRvbyBsb25nIGFuZCB3ZSB0cmlnZ2VyZWQgdGhlIGFzc2VydGlvbnMgaW4gdGhl IG1hbmFnZXIgdGhyZWFkLgorCisgICAgICAgIEkndmUgYnVtcGVkIHVwIHRoZSB0aW1lb3V0IGlu IHRoZSBtYW5hZ2VyIGFuZCBhZGRlZCBiZXR0ZXIKKyAgICAgICAgZGlhZ25vc3RpY3MuIEkgYWxz byBjbGVhbmVkIHVwIHRoZSBjbGVhbnVwKCkgY29kZSBhIGJpdCBiZWNhdXNlCisgICAgICAgIHRo ZXJlIHdhcyBzb21lIHVubmVjZXNzYXJ5IGlmLWNoZWNrcy4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXIucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvd29ya2VyLnB5 OgorCiAyMDExLTA2LTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tYW5hZ2VyLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlci5weQpp bmRleCA3NWJjZTBkMDVmNDkxODIyYjk1OTRiOGMwODUzNDAzZDdlNjc1ZGRiLi45ZWUxZDdlNzVi OGJhMTlkYzdhNjRiNjM0NDUxNjhmMmJlYmEyNGM5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tYW5hZ2VyLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXIu cHkKQEAgLTY3NCw4ICs2NzQsMTAgQEAgY2xhc3MgTWFuYWdlcjoKICAgICAgICAgICAgICMgTWFr ZSBzdXJlIGFsbCBvZiB0aGUgd29ya2VycyBoYXZlIHNodXQgZG93biAoaWYgcG9zc2libGUpLgog ICAgICAgICAgICAgZm9yIHdvcmtlcl9zdGF0ZSBpbiBzZWxmLl93b3JrZXJfc3RhdGVzLnZhbHVl cygpOgogICAgICAgICAgICAgICAgIGlmIG5vdCB3b3JrZXJfc3RhdGUud2VkZ2VkIGFuZCB3b3Jr ZXJfc3RhdGUud29ya2VyX2Nvbm5lY3Rpb24uaXNfYWxpdmUoKToKLSAgICAgICAgICAgICAgICAg ICAgd29ya2VyX3N0YXRlLndvcmtlcl9jb25uZWN0aW9uLmpvaW4oMC41KQotICAgICAgICAgICAg ICAgICAgICBhc3NlcnQgbm90IHdvcmtlcl9zdGF0ZS53b3JrZXJfY29ubmVjdGlvbi5pc19hbGl2 ZSgpCisgICAgICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoJ1dhaXRpbmcgZm9yIHdvcmtlciAl ZCB0byBleGl0JyAlIHdvcmtlcl9zdGF0ZS5udW1iZXIpCisgICAgICAgICAgICAgICAgICAgIHdv cmtlcl9zdGF0ZS53b3JrZXJfY29ubmVjdGlvbi5qb2luKDUuMCkKKyAgICAgICAgICAgICAgICAg ICAgaWYgd29ya2VyX3N0YXRlLndvcmtlcl9jb25uZWN0aW9uLmlzX2FsaXZlKCk6CisgICAgICAg ICAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCdXb3JrZWQgJWQgZGlkIG5vdCBleGl0IGluIHRp bWUuJyAlIHdvcmtlcl9zdGF0ZS5udW1iZXIpCiAKICAgICAgICAgZXhjZXB0IEtleWJvYXJkSW50 ZXJydXB0OgogICAgICAgICAgICAgX2xvZy5pbmZvKCJJbnRlcnJ1cHRlZCwgZXhpdGluZyIpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFj a2FnZS93b3JrZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS93b3JrZXIucHkKaW5kZXggNmZmM2YxMjU4YTIwZTc5N2I1MTJkNmY1MjE5ZTk5 NmViZTQzZjc4ZC4uZTk5ZWZhMzk3YzkxMzA5MTRjNjE3MWY3ZTFiNTE5YmZkNTljMzA0MCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2th Z2Uvd29ya2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL3dvcmtlci5weQpAQCAtMTEwLDYgKzExMCw3IEBAIGNsYXNzIFdvcmtlciht YW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICAgICAgICAgIHNl bGYuX3dvcmtlcl9jb25uZWN0aW9uLnBvc3RfbWVzc2FnZSgnZXhjZXB0aW9uJywKICAgICAgICAg ICAgICAgICAgICAgKGV4Y2VwdGlvbl90eXBlLCBleGNlcHRpb25fdmFsdWUsIE5vbmUpKQogICAg ICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdkb25lJykKKyAg ICAgICAgICAgIHNlbGYuY2xlYW51cCgpCiAKICAgICBkZWYgaGFuZGxlX3Rlc3RfbGlzdChzZWxm LCBzcmMsIGxpc3RfbmFtZSwgdGVzdF9saXN0KToKICAgICAgICAgaWYgbGlzdF9uYW1lID09ICJ0 ZXN0c190b19odHRwX2xvY2siOgpAQCAtMTQ0LDEzICsxNDUsMTMgQEAgY2xhc3MgV29ya2VyKG1h bmFnZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAgIHNlbGYuY2xlYW5f dXBfYWZ0ZXJfdGVzdCh0ZXN0X2lucHV0LCByZXN1bHQpCiAKICAgICBkZWYgY2xlYW51cChzZWxm KToKLSAgICAgICAgaWYgc2VsZi5fZHJpdmVyOgotICAgICAgICAgICAgc2VsZi5raWxsX2RyaXZl cigpCi0gICAgICAgIGlmIHNlbGYuX2hhc19odHRwX2xvY2s6Ci0gICAgICAgICAgICBzZWxmLnN0 b3Bfc2VydmVyc193aXRoX2xvY2soKQorICAgICAgICBfbG9nLmRlYnVnKCJjbGVhbmluZyB1cCIp CisgICAgICAgIHNlbGYua2lsbF9kcml2ZXIoKQorICAgICAgICBzZWxmLnN0b3Bfc2VydmVyc193 aXRoX2xvY2soKQogICAgICAgICBpZiBzZWxmLl90ZXN0c19ydW5fZmlsZToKICAgICAgICAgICAg IHNlbGYuX3Rlc3RzX3J1bl9maWxlLmNsb3NlKCkKICAgICAgICAgICAgIHNlbGYuX3Rlc3RzX3J1 bl9maWxlID0gTm9uZQorICAgICAgICBfbG9nLmRlYnVnKCJkb25lIGNsZWFuaW5nIHVwIikKIAog ICAgIGRlZiB0aW1lb3V0KHNlbGYsIHRlc3RfaW5wdXQpOgogICAgICAgICAiIiJDb21wdXRlIHRo ZSBhcHByb3ByaWF0ZSB0aW1lb3V0IHZhbHVlIGZvciBhIHRlc3QuIiIiCg==