172774 2017-05-31 13:58:10 -0700 test-webkitpy: stop forking unsafely from within a spawned process 2017-06-06 13:39:13 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dean_johnson dean_johnson buildbot commit-queue darin dean_johnson glenn lforschler webkit-bug-importer oldest_to_newest 1314307 0 dean_johnson 2017-05-31 13:58:10 -0700 webkitpy when running unit tests forks unsafely from within a spawned process while running the tests. 1314309 1 dean_johnson 2017-05-31 13:58:34 -0700 rdar://problem/32358666 1314310 2 webkit-bug-importer 2017-05-31 13:59:21 -0700 <rdar://problem/32494848> 1314312 3 311630 dean_johnson 2017-05-31 14:06:07 -0700 Created attachment 311630 Patch 1314437 4 311657 dean_johnson 2017-05-31 16:54:58 -0700 Created attachment 311657 Patch 1314438 5 dean_johnson 2017-05-31 16:57:21 -0700 Last patch changes instantiation of self._browser by instantiating it as 'None' in the __init__ function, then actually assigning it a mechanize.Browser() object if we attempt to use self._browser (in Builder.force_build) when it hasn't been initialized. This is similar to how access is done for statusserver and bugzilla interactions. 1314497 6 311657 ap 2017-05-31 19:20:23 -0700 Comment on attachment 311657 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=311657&action=review Nice temporary hack! This of course relies on not testing the force_build function, which is not great, and on not testing any other code touching objects that are unsafe to use while forking. > Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py:135 > + # Initialize here since Mechanize will spawn a new process for Browser, which is > + # incompatible with using Python's multiprocessing safely. I think that this comment may be a bit too vague. How about something like "Creating Browser lazily avoids doing that as part of test-webkitpy, which is unsafe due to other tests using Python's multiprocessing"? My comment says something different than yours, and I'm not entirely sure which is right. I don't see how the forking in Mechanize would be a problem, I think that it's regular run-webkit-tests forking that becomes a problem. 1314728 7 dean_johnson 2017-06-01 11:16:27 -0700 (In reply to Alexey Proskuryakov from comment #6) > Comment on attachment 311657 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=311657&action=review > > Nice temporary hack! This of course relies on not testing the force_build > function, which is not great, and on not testing any other code touching > objects that are unsafe to use while forking. Actually, bugzilla and statusserver tests use MockBrowser() objects for testing so I think we could still test this codepath if we wanted, and all we'd need to do is something like this: def test_force_build(self): from webkitpy.<something> import MockBrowser builder = Builder('test_builder') mock_browser = MockBrowser(args) # Setup return functions for Mock builder._browser = mock_browser builder.force_build() # Validate things ran as expected > > > Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py:135 > > + # Initialize here since Mechanize will spawn a new process for Browser, which is > > + # incompatible with using Python's multiprocessing safely. > > I think that this comment may be a bit too vague. How about something like > "Creating Browser lazily avoids doing that as part of test-webkitpy, which > is unsafe due to other tests using Python's multiprocessing"? > > My comment says something different than yours, and I'm not entirely sure > which is right. I don't see how the forking in Mechanize would be a problem, > I think that it's regular run-webkit-tests forking that becomes a problem. I feel my comment is more descriptive as to _why_ the logic now lives where it does, but I agree it could be improved upon. Maybe something like this would be better: "Python2.7's multiprocessing module does not safely allow of spawning processes from within already spawned multiprocessing.Process objects. Because testwebkit-py uses multiprocessing.Process based Runners to execute tests quickly, we can not safely instantiate a Mechanize browser while running webkitpy tests." 1315313 8 311890 dean_johnson 2017-06-02 17:48:25 -0700 Created attachment 311890 Patch 1315316 9 dean_johnson 2017-06-02 17:58:41 -0700 Removed comments Alexey and I were discussing since they were incorrect. 1316213 10 311890 commit-queue 2017-06-06 13:39:11 -0700 Comment on attachment 311890 Patch Clearing flags on attachment: 311890 Committed r217855: <http://trac.webkit.org/changeset/217855> 1316214 11 commit-queue 2017-06-06 13:39:13 -0700 All reviewed patches have been landed. Closing bug. 311630 2017-05-31 14:06:07 -0700 2017-05-31 16:54:56 -0700 Patch bug-172774-20170531140606.patch text/plain 2354 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NTc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmQ5NzI5YzBiODYwMTBjMDYyNzk3Zjc2Y2Q4NjE0ODQ2 ZmU0NWY4OS4uNTdmOWQ4Y2E3NTk0YmY0YmVhMGIwMzM0NjgwYjlkZjM2NDg0ZTQxOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE3LTA1LTMxICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgor CisgICAgICAgIHRlc3Qtd2Via2l0cHk6IHN0b3AgZm9ya2luZyB1bnNhZmVseSBmcm9tIHdpdGhp biBhIHNwYXduZWQgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyNzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRi b3QucHk6CisgICAgICAgIChCdWlsZGVyLl9faW5pdF9fKTogV2UgZG9uJ3QgdXNlIGJyb3dzZXIg YXMgcGFydCBvZiB0ZXN0aW5nLCBzbyBvbmx5IGluaXRpYWxpemUgaXQgd2hlbiBpdCdzIGdvaW5n IHRvIGJlIHVzZWQuCisgICAgICAgIChCdWlsZGVyLmZvcmNlX2J1aWxkLnByZWRpY2F0ZSk6Cisg ICAgICAgIChCdWlsZGVyLmZvcmNlX2J1aWxkKToKKwogMjAxNy0wNS0zMCAgRGFuaWVsIEJhdGVz ICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHVuaXQgdGVzdCBmb3IgV2ViS2l0 MiBDIFNQSSBydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwoKQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5CmluZGV4IGI4 NGM5NTg5NmM4NGY3OGRiYjc4YzY2YmJlMjNkNTcwZDMzNmE4Y2QuLjIyYTU2ZGY3M2IzZDY3NDRi ZDVkNjEyNWFiZjQ2Mjc5NTYzMGZjZmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9idWlsZGJvdC9idWlsZGJvdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3QucHkKQEAgLTUxLDkgKzUxLDYgQEAg Y2xhc3MgQnVpbGRlcihvYmplY3QpOgogICAgICAgICBzZWxmLl9idWlsZGJvdCA9IGJ1aWxkYm90 CiAgICAgICAgIHNlbGYuX2J1aWxkc19jYWNoZSA9IHt9CiAgICAgICAgIHNlbGYuX3JldmlzaW9u X3RvX2J1aWxkX251bWJlciA9IE5vbmUKLSAgICAgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5 LmF1dG9pbnN0YWxsZWQubWVjaGFuaXplIGltcG9ydCBCcm93c2VyCi0gICAgICAgIHNlbGYuX2Jy b3dzZXIgPSBCcm93c2VyKCkKLSAgICAgICAgc2VsZi5fYnJvd3Nlci5zZXRfaGFuZGxlX3JvYm90 cyhGYWxzZSkgICMgVGhlIGJ1aWxkZXIgcGFnZXMgYXJlIGV4Y2x1ZGVkIGJ5IHJvYm90cy50eHQK IAogICAgIGRlZiBuYW1lKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fbmFtZQpAQCAtMTMx LDYgKzEyOCwxNCBAQCBjbGFzcyBCdWlsZGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgcmV0 dXJuIGZvcm0uZmluZF9jb250cm9sKCJ1c2VybmFtZSIpCiAgICAgICAgICAgICBleGNlcHQgRXhj ZXB0aW9uLCBlOgogICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQorCisgICAgICAgICMgSW5p dGlhbGl6ZSBoZXJlIHNpbmNlIE1lY2hhbml6ZSB3aWxsIHNwYXduIGEgbmV3IHByb2Nlc3MgZm9y IEJyb3dzZXIsIHdoaWNoIGlzCisgICAgICAgICMgaW5jb21wYXRpYmxlIHdpdGggdXNpbmcgUHl0 aG9uJ3MgbXVsdGlwcm9jZXNzaW5nIHNhZmVseS4KKyAgICAgICAgaWYgbm90IGhhc2F0dHIoc2Vs ZiwgJ19icm93c2VyJyk6CisgICAgICAgICAgICBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0 b2luc3RhbGxlZC5tZWNoYW5pemUgaW1wb3J0IEJyb3dzZXIKKyAgICAgICAgICAgIHNlbGYuX2Jy b3dzZXIgPSBCcm93c2VyKCkKKyAgICAgICAgICAgIHNlbGYuX2Jyb3dzZXIuc2V0X2hhbmRsZV9y b2JvdHMoRmFsc2UpICAjIFRoZSBidWlsZGVyIHBhZ2VzIGFyZSBleGNsdWRlZCBieSByb2JvdHMu dHh0CisKICAgICAgICAgIyBpZ25vcmUgZmFsc2UgcG9zaXRpdmVzIGZvciBtaXNzaW5nIEJyb3dz ZXIgbWV0aG9kcyAtIHB5bGludDogZGlzYWJsZT1FMTEwMgogICAgICAgICBzZWxmLl9icm93c2Vy Lm9wZW4oc2VsZi51cmwoKSkKICAgICAgICAgc2VsZi5fYnJvd3Nlci5zZWxlY3RfZm9ybShwcmVk aWNhdGU9cHJlZGljYXRlKQo= 311657 2017-05-31 16:54:58 -0700 2017-06-02 17:48:24 -0700 Patch bug-172774-20170531165457.patch text/plain 2644 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NTc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmQ5NzI5YzBiODYwMTBjMDYyNzk3Zjc2Y2Q4NjE0ODQ2 ZmU0NWY4OS4uMGQ2Y2NlY2NmOTA4NzYzYjI0Nzg5ZThlNjQzYWVjODA0ZTU2ZmU5YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE3LTA1LTMxICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgor CisgICAgICAgIHRlc3Qtd2Via2l0cHk6IHN0b3AgZm9ya2luZyB1bnNhZmVseSBmcm9tIHdpdGhp biBhIHNwYXduZWQgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyNzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRi b3QucHk6CisgICAgICAgIChCdWlsZGVyLl9faW5pdF9fKTogV2UgZG9uJ3QgdXNlIG1lY2hhbml6 ZS5Ccm93c2VyKCkgYXMgcGFydCBvZiB0ZXN0aW5nLCBzbyBvbmx5IGluaXRpYWxpemUgaXQgd2hl bgorICAgICAgICBpdCdzIGdvaW5nIHRvIGJlIHVzZWQuCisgICAgICAgIChCdWlsZGVyLmZvcmNl X2J1aWxkKToKKwogMjAxNy0wNS0zMCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIHVuaXQgdGVzdCBmb3IgV2ViS2l0MiBDIFNQSSBydW5CZWZvcmVVbmxv YWRDb25maXJtUGFuZWwoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5CmluZGV4IGI4NGM5NTg5NmM4NGY3OGRiYjc4YzY2 YmJlMjNkNTcwZDMzNmE4Y2QuLmQ4YzBlMjBmM2Q5OWYyMTU1ZGUzZDcxYzlkODUwYTBlNGJlOGM0 MWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJv dC9idWlsZGJvdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVp bGRib3QvYnVpbGRib3QucHkKQEAgLTQwLDYgKzQwLDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24u bmV0Lm5ldHdvcmt0cmFuc2FjdGlvbiBpbXBvcnQgTmV0d29ya1RyYW5zYWN0aW9uCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5uZXQucmVncmVzc2lvbndpbmRvdyBpbXBvcnQgUmVncmVzc2lvbldpbmRv dwogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmxvZ3V0aWxzIGltcG9ydCBnZXRfbG9nZ2Vy CiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuQmVhdXRpZnVsU291cCBpbXBvcnQgQmVhdXRpZnVs U291cAorZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQubWVjaGFuaXplIGlt cG9ydCBCcm93c2VyCiAKIAogX2xvZyA9IGdldF9sb2dnZXIoX19maWxlX18pCkBAIC01MSw5ICs1 Miw3IEBAIGNsYXNzIEJ1aWxkZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fYnVpbGRib3QgPSBi dWlsZGJvdAogICAgICAgICBzZWxmLl9idWlsZHNfY2FjaGUgPSB7fQogICAgICAgICBzZWxmLl9y ZXZpc2lvbl90b19idWlsZF9udW1iZXIgPSBOb25lCi0gICAgICAgIGZyb20gd2Via2l0cHkudGhp cmRwYXJ0eS5hdXRvaW5zdGFsbGVkLm1lY2hhbml6ZSBpbXBvcnQgQnJvd3NlcgotICAgICAgICBz ZWxmLl9icm93c2VyID0gQnJvd3NlcigpCi0gICAgICAgIHNlbGYuX2Jyb3dzZXIuc2V0X2hhbmRs ZV9yb2JvdHMoRmFsc2UpICAjIFRoZSBidWlsZGVyIHBhZ2VzIGFyZSBleGNsdWRlZCBieSByb2Jv dHMudHh0CisgICAgICAgIHNlbGYuX2Jyb3dzZXIgPSBOb25lCiAKICAgICBkZWYgbmFtZShzZWxm KToKICAgICAgICAgcmV0dXJuIHNlbGYuX25hbWUKQEAgLTEzMSw2ICsxMzAsMTMgQEAgY2xhc3Mg QnVpbGRlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIHJldHVybiBmb3JtLmZpbmRfY29udHJv bCgidXNlcm5hbWUiKQogICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiwgZToKICAgICAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKKworICAgICAgICAjIEluaXRpYWxpemUgaGVyZSBzaW5jZSBN ZWNoYW5pemUgd2lsbCBzcGF3biBhIG5ldyBwcm9jZXNzIGZvciBCcm93c2VyLCB3aGljaCBpcwor ICAgICAgICAjIGluY29tcGF0aWJsZSB3aXRoIHVzaW5nIFB5dGhvbidzIG11bHRpcHJvY2Vzc2lu ZyBzYWZlbHkuCisgICAgICAgIGlmIG5vdCBzZWxmLl9icm93c2VyOgorICAgICAgICAgICAgc2Vs Zi5fYnJvd3NlciA9IEJyb3dzZXIoKQorICAgICAgICAgICAgc2VsZi5fYnJvd3Nlci5zZXRfaGFu ZGxlX3JvYm90cyhGYWxzZSkgICMgVGhlIGJ1aWxkZXIgcGFnZXMgYXJlIGV4Y2x1ZGVkIGJ5IHJv Ym90cy50eHQKKwogICAgICAgICAjIGlnbm9yZSBmYWxzZSBwb3NpdGl2ZXMgZm9yIG1pc3Npbmcg QnJvd3NlciBtZXRob2RzIC0gcHlsaW50OiBkaXNhYmxlPUUxMTAyCiAgICAgICAgIHNlbGYuX2Jy b3dzZXIub3BlbihzZWxmLnVybCgpKQogICAgICAgICBzZWxmLl9icm93c2VyLnNlbGVjdF9mb3Jt KHByZWRpY2F0ZT1wcmVkaWNhdGUpCg== 311890 2017-06-02 17:48:25 -0700 2017-06-06 13:39:11 -0700 Patch bug-172774-20170602174824.patch text/plain 2486 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NTc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmQ5NzI5YzBiODYwMTBjMDYyNzk3Zjc2Y2Q4NjE0ODQ2 ZmU0NWY4OS4uMGQ2Y2NlY2NmOTA4NzYzYjI0Nzg5ZThlNjQzYWVjODA0ZTU2ZmU5YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE3LTA1LTMxICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgor CisgICAgICAgIHRlc3Qtd2Via2l0cHk6IHN0b3AgZm9ya2luZyB1bnNhZmVseSBmcm9tIHdpdGhp biBhIHNwYXduZWQgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyNzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRi b3QucHk6CisgICAgICAgIChCdWlsZGVyLl9faW5pdF9fKTogV2UgZG9uJ3QgdXNlIG1lY2hhbml6 ZS5Ccm93c2VyKCkgYXMgcGFydCBvZiB0ZXN0aW5nLCBzbyBvbmx5IGluaXRpYWxpemUgaXQgd2hl bgorICAgICAgICBpdCdzIGdvaW5nIHRvIGJlIHVzZWQuCisgICAgICAgIChCdWlsZGVyLmZvcmNl X2J1aWxkKToKKwogMjAxNy0wNS0zMCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIHVuaXQgdGVzdCBmb3IgV2ViS2l0MiBDIFNQSSBydW5CZWZvcmVVbmxv YWRDb25maXJtUGFuZWwoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5CmluZGV4IGI4NGM5NTg5NmM4NGY3OGRiYjc4YzY2 YmJlMjNkNTcwZDMzNmE4Y2QuLmJjZTc5NjgzNTAwMTdiNzNhNGI1YWNiMjAwNmRhZTNiYmI2YzY1 NTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJv dC9idWlsZGJvdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVp bGRib3QvYnVpbGRib3QucHkKQEAgLTQwLDYgKzQwLDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24u bmV0Lm5ldHdvcmt0cmFuc2FjdGlvbiBpbXBvcnQgTmV0d29ya1RyYW5zYWN0aW9uCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5uZXQucmVncmVzc2lvbndpbmRvdyBpbXBvcnQgUmVncmVzc2lvbldpbmRv dwogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmxvZ3V0aWxzIGltcG9ydCBnZXRfbG9nZ2Vy CiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuQmVhdXRpZnVsU291cCBpbXBvcnQgQmVhdXRpZnVs U291cAorZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQubWVjaGFuaXplIGlt cG9ydCBCcm93c2VyCiAKIAogX2xvZyA9IGdldF9sb2dnZXIoX19maWxlX18pCkBAIC01MSw5ICs1 Miw3IEBAIGNsYXNzIEJ1aWxkZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fYnVpbGRib3QgPSBi dWlsZGJvdAogICAgICAgICBzZWxmLl9idWlsZHNfY2FjaGUgPSB7fQogICAgICAgICBzZWxmLl9y ZXZpc2lvbl90b19idWlsZF9udW1iZXIgPSBOb25lCi0gICAgICAgIGZyb20gd2Via2l0cHkudGhp cmRwYXJ0eS5hdXRvaW5zdGFsbGVkLm1lY2hhbml6ZSBpbXBvcnQgQnJvd3NlcgotICAgICAgICBz ZWxmLl9icm93c2VyID0gQnJvd3NlcigpCi0gICAgICAgIHNlbGYuX2Jyb3dzZXIuc2V0X2hhbmRs ZV9yb2JvdHMoRmFsc2UpICAjIFRoZSBidWlsZGVyIHBhZ2VzIGFyZSBleGNsdWRlZCBieSByb2Jv dHMudHh0CisgICAgICAgIHNlbGYuX2Jyb3dzZXIgPSBOb25lCiAKICAgICBkZWYgbmFtZShzZWxm KToKICAgICAgICAgcmV0dXJuIHNlbGYuX25hbWUKQEAgLTEzMSw2ICsxMzAsMTEgQEAgY2xhc3Mg QnVpbGRlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIHJldHVybiBmb3JtLmZpbmRfY29udHJv bCgidXNlcm5hbWUiKQogICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiwgZToKICAgICAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKKworICAgICAgICBpZiBub3Qgc2VsZi5fYnJvd3NlcjoKKyAg ICAgICAgICAgIHNlbGYuX2Jyb3dzZXIgPSBCcm93c2VyKCkKKyAgICAgICAgICAgIHNlbGYuX2Jy b3dzZXIuc2V0X2hhbmRsZV9yb2JvdHMoRmFsc2UpICAjIFRoZSBidWlsZGVyIHBhZ2VzIGFyZSBl eGNsdWRlZCBieSByb2JvdHMudHh0CisKICAgICAgICAgIyBpZ25vcmUgZmFsc2UgcG9zaXRpdmVz IGZvciBtaXNzaW5nIEJyb3dzZXIgbWV0aG9kcyAtIHB5bGludDogZGlzYWJsZT1FMTEwMgogICAg ICAgICBzZWxmLl9icm93c2VyLm9wZW4oc2VsZi51cmwoKSkKICAgICAgICAgc2VsZi5fYnJvd3Nl ci5zZWxlY3RfZm9ybShwcmVkaWNhdGU9cHJlZGljYXRlKQo=