228429 2021-07-27 15:16:16 -0700 [run-webkit-tests] Run largest shards first 2022-12-21 14:23:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 171615 1 jbedard jbedard aakash_jain ap ews-watchlist glenn gsnedders ryanhaddad webkit-bug-importer oldest_to_newest 1779853 0 jbedard 2021-07-27 15:16:16 -0700 Alexey pointed this out a few weeks ago, and it's particularly obvious with webgl tests. Essentially, because we run tests in alphabetical order, any given invocation of run-webkit-tests will be inefficiently running towards the end, because there will be a larger shard running on a single process. The solution to this is to run the largest shards first. The potential problem with this is that we're sacrificing predictable test order, which may have an effect on flakiness. I think this trade-off will be worth it. 1779854 1 webkit-bug-importer 2021-07-27 15:16:46 -0700 <rdar://problem/81184667> 1779855 2 434344 jbedard 2021-07-27 15:20:56 -0700 Created attachment 434344 Patch 1779881 3 434382 jbedard 2021-07-27 16:21:54 -0700 Created attachment 434382 Patch 1779898 4 jbedard 2021-07-27 16:56:05 -0700 Let's wait for EWS before officially landing this, since we know it could effect flakiness, this will at least help avoid anything obvious. 1779920 5 ap 2021-07-27 17:44:49 -0700 It looks like build 12531 (for this patch) was slower than others on this bot? So not sure if this is a progression or a regression. Perhaps test run time has a huge variance. I didn't look at the logs to dig deeply. https://ews-build.webkit.org/#/workers/56 1780058 6 jbedard 2021-07-28 08:05:33 -0700 The more concerning thing is that we surfaced a debug crash by changing test ordering. That being said, looking through our test runs, it looks to be a 10-15% improvement in most cases, layout tests just have so much variance it's hard to tell. 1780277 7 jbedard 2021-07-28 17:43:26 -0700 There aren't any easy answers to this, the two crashes are pretty difficult to reproduce, but EWS is able to reliably do so, and it's a good bet infrastructure will as well. We need to resolve these crashes (and maybe a few others) before landing. 1780296 8 434490 jbedard 2021-07-28 19:08:06 -0700 Created attachment 434490 Patch 1780742 9 gsnedders 2021-07-30 06:03:09 -0700 (In reply to Jonathan Bedard from comment #7) > There aren't any easy answers to this, the two crashes are pretty difficult > to reproduce, but EWS is able to reliably do so, and it's a good bet > infrastructure will as well. We need to resolve these crashes (and maybe a > few others) before landing. I'm only seeing one crash in WK2 in all the patches? The WK1 crash seems to have affected main as well. But needless to say, the WK2 crash is bug 224085; note that other fullscreen tests have been skipped as a result of it. In general: I'm concerned that changing the order that the shards are run effects test results, as it implies little in the way of isolation between the different shards, and any bad state in one shard can end up affecting other shards. That said, some of the problem here is that we allocate all the shards to workers ahead-of-time, instead of (e.g.) reading from a Queue or having any sort of work-stealing, hence we can still end up with imbalances in worker execution time even after this patch. 1782380 10 jbedard 2021-08-05 15:48:33 -0700 (In reply to Sam Sneddon [:gsnedders] from comment #9) > (In reply to Jonathan Bedard from comment #7) > > There aren't any easy answers to this, the two crashes are pretty difficult > > to reproduce, but EWS is able to reliably do so, and it's a good bet > > infrastructure will as well. We need to resolve these crashes (and maybe a > > few others) before landing. > > I'm only seeing one crash in WK2 in all the patches? The WK1 crash seems to > have affected main as well. But needless to say, the WK2 crash is bug > 224085; note that other fullscreen tests have been skipped as a result of it. > > In general: I'm concerned that changing the order that the shards are run > effects test results, as it implies little in the way of isolation between > the different shards, and any bad state in one shard can end up affecting > other shards. > > That said, some of the problem here is that we allocate all the shards to > workers ahead-of-time, instead of (e.g.) reading from a Queue or having any > sort of work-stealing, hence we can still end up with imbalances in worker > execution time even after this patch. EWS retries failed tests individually, the flaky failures in something like https://ews-build.webkit.org/#/builders/59/builds/12630 are still of concern. Also, the TaskPool code doesn't allocate the shards to the workers ahead of time, we are using a Queue that's shared between each process. You will always get some imbalances at the end of the test run, but this patch should minimize them. 1871872 11 459772 jbedard 2022-05-25 15:58:06 -0700 Created attachment 459772 Patch 1871950 12 459772 gsnedders 2022-05-25 22:30:52 -0700 Comment on attachment 459772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459772&action=review I don't know what your plans are here (and this isn't r? anyway), but… > Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:568 > - shard = TestShard(directory, test_inputs) > - shards.append(shard) > + while len(test_inputs) > MAX_SHARD_SIZE: > + shards.append(TestShard(directory, test_inputs[:MAX_SHARD_SIZE])) > + test_inputs = test_inputs[MAX_SHARD_SIZE:] > + shards.append(TestShard(directory, test_inputs)) I'd rather we didn't change this in the same patch. That said, simple numeric splits have the risk of things moving between shards too often (i.e., adding a new test early on in a shard will change every split), but let's take this design discussion to a new/different bug? 1872435 13 459772 jbedard 2022-05-27 15:08:49 -0700 Comment on attachment 459772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459772&action=review >> Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:568 >> + shards.append(TestShard(directory, test_inputs)) > > I'd rather we didn't change this in the same patch. That said, simple numeric splits have the risk of things moving between shards too often (i.e., adding a new test early on in a shard will change every split), but let's take this design discussion to a new/different bug? Didn't mark this as review because this was just posted for testing, no intention of landing this change as is. 1921230 14 jbedard 2022-12-21 14:23:19 -0800 Pull request: https://github.com/WebKit/WebKit/pull/7979 434344 2021-07-27 15:20:56 -0700 2021-07-27 16:21:51 -0700 Patch bug-228429-20210727152055.patch text/plain 1419 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDM1MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDIxLTA3LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gUnVuIGxhcmdlc3Qgc2hhcmRzIGZpcnN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg0MjkK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxMTg0NjY3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoU2hhcmRlci5f c2hhcmRfYnlfZGlyZWN0b3J5KTogU29ydCBzaGFyZHMgYnkgc2l6ZS4KKwogMjAyMS0wNy0yNyAg S2V2aW4gTmVhbCAgPGtldmluX25lYWxAYXBwbGUuY29tPgogCiAgICAgICAgIFtyZXN1bHRzLndl YmtpdC5vcmddIFRvb2x0aXBzIHNob3VsZCByZW1haW4gdmlzaWJsZSB3aGVuIGhvdmVyaW5nIG92 ZXIgY29tbWl0IHJlcHJlc2VudGF0aW9ucwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91 dF90ZXN0X3J1bm5lci5weQkocmV2aXNpb24gMjgwMzUwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC01NTksNyArNTU5LDggQEAgY2xhc3MgU2hhcmRlcihvYmplY3QpOgogICAg ICAgICAgICAgc2hhcmQgPSBUZXN0U2hhcmQoZGlyZWN0b3J5LCB0ZXN0X2lucHV0cykKICAgICAg ICAgICAgIHNoYXJkcy5hcHBlbmQoc2hhcmQpCiAKLSAgICAgICAgIyBTb3J0IHRoZSBzaGFyZHMg YnkgZGlyZWN0b3J5IG5hbWUuCisgICAgICAgICMgU29ydCB0aGUgc2hhcmRzIGJ5IGRpcmVjdG9y eSBuYW1lLCB0aGVuIGlucHV0IHNpemUuCiAgICAgICAgIHNoYXJkcy5zb3J0KGtleT1sYW1iZGEg c2hhcmQ6IHNoYXJkLm5hbWUpCisgICAgICAgIHNoYXJkcy5zb3J0KGtleT1sYW1iZGEgc2hhcmQ6 IC1sZW4oc2hhcmQudGVzdF9pbnB1dHMpKQogCiAgICAgICAgIHJldHVybiBzaGFyZHMK 434382 2021-07-27 16:21:54 -0700 2021-07-28 19:08:04 -0700 Patch bug-228429-20210727162153.patch text/plain 3837 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDM1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTA3LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gUnVuIGxhcmdlc3Qgc2hhcmRzIGZpcnN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg0MjkK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxMTg0NjY3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoU2hhcmRlci5f c2hhcmRfYnlfZGlyZWN0b3J5KTogU29ydCBzaGFyZHMgYnkgc2l6ZS4KKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJf dW5pdHRlc3QucHk6CisgICAgICAgIChTaGFyZGVyVGVzdHMudGVzdF9zaGFyZF9ieV9kaXIpOiBS ZWJhc2VsaW5lIHRlc3QuCisKIDIwMjEtMDctMjcgIERpZWdvIFBpbm8gR2FyY2lhICA8ZHBpbm9A aWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIE1vdmUgV2ViS2l0R1RLIGFuZCBXUEUg ZGVwZW5kZW5jeSBwYWNrYWdlcyB0byBhIGNvbW1vbiBHTElCIGxpc3QKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X3J1bm5l ci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkJKHJldmlzaW9uIDI4MDM1NikKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0 X3J1bm5lci5weQkod29ya2luZyBjb3B5KQpAQCAtNTU5LDcgKzU1OSw4IEBAIGNsYXNzIFNoYXJk ZXIob2JqZWN0KToKICAgICAgICAgICAgIHNoYXJkID0gVGVzdFNoYXJkKGRpcmVjdG9yeSwgdGVz dF9pbnB1dHMpCiAgICAgICAgICAgICBzaGFyZHMuYXBwZW5kKHNoYXJkKQogCi0gICAgICAgICMg U29ydCB0aGUgc2hhcmRzIGJ5IGRpcmVjdG9yeSBuYW1lLgorICAgICAgICAjIFNvcnQgdGhlIHNo YXJkcyBieSBkaXJlY3RvcnkgbmFtZSwgdGhlbiBpbnB1dCBzaXplLgogICAgICAgICBzaGFyZHMu c29ydChrZXk9bGFtYmRhIHNoYXJkOiBzaGFyZC5uYW1lKQorICAgICAgICBzaGFyZHMuc29ydChr ZXk9bGFtYmRhIHNoYXJkOiAtbGVuKHNoYXJkLnRlc3RfaW5wdXRzKSkKIAogICAgICAgICByZXR1 cm4gc2hhcmRzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3Rf cnVubmVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyODAzNTYpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5pdHRl c3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4MSwxNSArMjgxLDE5IEBAIGNsYXNzIFNoYXJkZXJU ZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3Rfc2hhcmRfYnlfZGlyKHNlbGYp OgogICAgICAgICByZXN1bHQgPSBzZWxmLmdldF9zaGFyZHMobnVtX3dvcmtlcnM9MiwgZnVsbHlf cGFyYWxsZWw9RmFsc2UpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRfc2hhcmRzKHJlc3VsdCwKLSAg ICAgICAgICAgIFsoJ2FuaW1hdGlvbnMnLCBbJ2FuaW1hdGlvbnMva2V5ZnJhbWVzLmh0bWwnXSks Ci0gICAgICAgICAgICAgKCdkb20vaHRtbC9sZXZlbDIvaHRtbCcsIFsnZG9tL2h0bWwvbGV2ZWwy L2h0bWwvSFRNTEFuY2hvckVsZW1lbnQwMy5odG1sJywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ2RvbS9odG1sL2xldmVsMi9odG1sL0hUTUxBbmNob3JFbGVtZW50MDYu aHRtbCddKSwKLSAgICAgICAgICAgICAoJ2Zhc3QvY3NzJywgWydmYXN0L2Nzcy9kaXNwbGF5LW5v bmUtaW5saW5lLXN0eWxlLWNoYW5nZS1jcmFzaC5odG1sJ10pLAotICAgICAgICAgICAgICgnaHR0 cC90ZXN0cy9zZWN1cml0eScsIFsnaHR0cC90ZXN0cy9zZWN1cml0eS92aWV3LXNvdXJjZS1uby1y ZWZyZXNoLmh0bWwnXSksCi0gICAgICAgICAgICAgKCdodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0 cycsIFsnaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvdW5pY29kZS5odG0nLCAnaHR0cC90ZXN0 cy93ZWJzb2NrZXQvdGVzdHMvd2Vic29ja2V0LXByb3RvY29sLWlnbm9yZWQuaHRtbCddKSwKLSAg ICAgICAgICAgICAoJ2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QnLCBbJ2h0dHAvdGVzdHMveG1s aHR0cHJlcXVlc3Qvc3VwcG9ydGVkLXhtbC1jb250ZW50LXR5cGVzLmh0bWwnXSksCi0gICAgICAg ICAgICAgKCdpZXRlc3RjZW50ZXIvSmF2YXNjcmlwdCcsIFsnaWV0ZXN0Y2VudGVyL0phdmFzY3Jp cHQvMTEuMS41XzQtNC1jLTEuaHRtbCddKV0pCisgICAgICAgIHNlbGYuYXNzZXJ0X3NoYXJkcyhy ZXN1bHQsIFsKKyAgICAgICAgICAgICgnZG9tL2h0bWwvbGV2ZWwyL2h0bWwnLCBbCisgICAgICAg ICAgICAgICAgJ2RvbS9odG1sL2xldmVsMi9odG1sL0hUTUxBbmNob3JFbGVtZW50MDMuaHRtbCcs CisgICAgICAgICAgICAgICAgJ2RvbS9odG1sL2xldmVsMi9odG1sL0hUTUxBbmNob3JFbGVtZW50 MDYuaHRtbCcsCisgICAgICAgICAgICBdKSwgKCdodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cycs IFsKKyAgICAgICAgICAgICAgICAnaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvdW5pY29kZS5o dG0nLAorICAgICAgICAgICAgICAgICdodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy93ZWJzb2Nr ZXQtcHJvdG9jb2wtaWdub3JlZC5odG1sJywKKyAgICAgICAgICAgIF0pLCAoJ2FuaW1hdGlvbnMn LCBbJ2FuaW1hdGlvbnMva2V5ZnJhbWVzLmh0bWwnXSksCisgICAgICAgICAgICAoJ2Zhc3QvY3Nz JywgWydmYXN0L2Nzcy9kaXNwbGF5LW5vbmUtaW5saW5lLXN0eWxlLWNoYW5nZS1jcmFzaC5odG1s J10pLAorICAgICAgICAgICAgKCdodHRwL3Rlc3RzL3NlY3VyaXR5JywgWydodHRwL3Rlc3RzL3Nl Y3VyaXR5L3ZpZXctc291cmNlLW5vLXJlZnJlc2guaHRtbCddKSwKKyAgICAgICAgICAgICgnaHR0 cC90ZXN0cy94bWxodHRwcmVxdWVzdCcsIFsnaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zdXBw b3J0ZWQteG1sLWNvbnRlbnQtdHlwZXMuaHRtbCddKSwKKyAgICAgICAgICAgICgnaWV0ZXN0Y2Vu dGVyL0phdmFzY3JpcHQnLCBbJ2lldGVzdGNlbnRlci9KYXZhc2NyaXB0LzExLjEuNV80LTQtYy0x Lmh0bWwnXSksCisgICAgICAgIF0pCiAKICAgICBkZWYgdGVzdF9zaGFyZF9ldmVyeV9maWxlKHNl bGYpOgogICAgICAgICByZXN1bHQgPSBzZWxmLmdldF9zaGFyZHMobnVtX3dvcmtlcnM9MiwgZnVs bHlfcGFyYWxsZWw9VHJ1ZSkK 434490 2021-07-28 19:08:06 -0700 2022-05-25 15:58:04 -0700 Patch bug-228429-20210728190805.patch text/plain 3829 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDQxMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTA3LTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gUnVuIGxhcmdlc3Qgc2hhcmRzIGZpcnN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg0MjkK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxMTg0NjY3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IFJ5YW4gSGFkZGFkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoU2hhcmRlci5fc2hh cmRfYnlfZGlyZWN0b3J5KTogU29ydCBzaGFyZHMgYnkgc2l6ZS4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5p dHRlc3QucHk6CisgICAgICAgIChTaGFyZGVyVGVzdHMudGVzdF9zaGFyZF9ieV9kaXIpOiBSZWJh c2VsaW5lIHRlc3QuCisKIDIwMjEtMDctMjggIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBw bGUuY29tPgogCiAgICAgICAgIFt3ZWJraXRjb3JlcHldIEZpeCByYWNlIGNvbmRpdGlvbiBpbiBU YXNrUG9vbCB1bml0dGVzdHMgKGZvbGxvdy11cCBmaXgpCkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5CShyZXZpc2lvbiAyODA0MTIpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIu cHkJKHdvcmtpbmcgY29weSkKQEAgLTU1OSw3ICs1NTksOCBAQCBjbGFzcyBTaGFyZGVyKG9iamVj dCk6CiAgICAgICAgICAgICBzaGFyZCA9IFRlc3RTaGFyZChkaXJlY3RvcnksIHRlc3RfaW5wdXRz KQogICAgICAgICAgICAgc2hhcmRzLmFwcGVuZChzaGFyZCkKIAotICAgICAgICAjIFNvcnQgdGhl IHNoYXJkcyBieSBkaXJlY3RvcnkgbmFtZS4KKyAgICAgICAgIyBTb3J0IHRoZSBzaGFyZHMgYnkg ZGlyZWN0b3J5IG5hbWUsIHRoZW4gaW5wdXQgc2l6ZS4KICAgICAgICAgc2hhcmRzLnNvcnQoa2V5 PWxhbWJkYSBzaGFyZDogc2hhcmQubmFtZSkKKyAgICAgICAgc2hhcmRzLnNvcnQoa2V5PWxhbWJk YSBzaGFyZDogLWxlbihzaGFyZC50ZXN0X2lucHV0cykpCiAKICAgICAgICAgcmV0dXJuIHNoYXJk cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bGF5b3V0X3Rlc3RfcnVubmVyX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X3J1bm5lcl91 bml0dGVzdC5weQkocmV2aXNpb24gMjgwNDEyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyX3VuaXR0ZXN0LnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0yODEsMTUgKzI4MSwxOSBAQCBjbGFzcyBTaGFyZGVyVGVzdHModW5p dHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X3NoYXJkX2J5X2RpcihzZWxmKToKICAgICAg ICAgcmVzdWx0ID0gc2VsZi5nZXRfc2hhcmRzKG51bV93b3JrZXJzPTIsIGZ1bGx5X3BhcmFsbGVs PUZhbHNlKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0X3NoYXJkcyhyZXN1bHQsCi0gICAgICAgICAg ICBbKCdhbmltYXRpb25zJywgWydhbmltYXRpb25zL2tleWZyYW1lcy5odG1sJ10pLAotICAgICAg ICAgICAgICgnZG9tL2h0bWwvbGV2ZWwyL2h0bWwnLCBbJ2RvbS9odG1sL2xldmVsMi9odG1sL0hU TUxBbmNob3JFbGVtZW50MDMuaHRtbCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICdkb20vaHRtbC9sZXZlbDIvaHRtbC9IVE1MQW5jaG9yRWxlbWVudDA2Lmh0bWwnXSks Ci0gICAgICAgICAgICAgKCdmYXN0L2NzcycsIFsnZmFzdC9jc3MvZGlzcGxheS1ub25lLWlubGlu ZS1zdHlsZS1jaGFuZ2UtY3Jhc2guaHRtbCddKSwKLSAgICAgICAgICAgICAoJ2h0dHAvdGVzdHMv c2VjdXJpdHknLCBbJ2h0dHAvdGVzdHMvc2VjdXJpdHkvdmlldy1zb3VyY2Utbm8tcmVmcmVzaC5o dG1sJ10pLAotICAgICAgICAgICAgICgnaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMnLCBbJ2h0 dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VuaWNvZGUuaHRtJywgJ2h0dHAvdGVzdHMvd2Vic29j a2V0L3Rlc3RzL3dlYnNvY2tldC1wcm90b2NvbC1pZ25vcmVkLmh0bWwnXSksCi0gICAgICAgICAg ICAgKCdodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0JywgWydodHRwL3Rlc3RzL3htbGh0dHByZXF1 ZXN0L3N1cHBvcnRlZC14bWwtY29udGVudC10eXBlcy5odG1sJ10pLAotICAgICAgICAgICAgICgn aWV0ZXN0Y2VudGVyL0phdmFzY3JpcHQnLCBbJ2lldGVzdGNlbnRlci9KYXZhc2NyaXB0LzExLjEu NV80LTQtYy0xLmh0bWwnXSldKQorICAgICAgICBzZWxmLmFzc2VydF9zaGFyZHMocmVzdWx0LCBb CisgICAgICAgICAgICAoJ2RvbS9odG1sL2xldmVsMi9odG1sJywgWworICAgICAgICAgICAgICAg ICdkb20vaHRtbC9sZXZlbDIvaHRtbC9IVE1MQW5jaG9yRWxlbWVudDAzLmh0bWwnLAorICAgICAg ICAgICAgICAgICdkb20vaHRtbC9sZXZlbDIvaHRtbC9IVE1MQW5jaG9yRWxlbWVudDA2Lmh0bWwn LAorICAgICAgICAgICAgXSksICgnaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMnLCBbCisgICAg ICAgICAgICAgICAgJ2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VuaWNvZGUuaHRtJywKKyAg ICAgICAgICAgICAgICAnaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvd2Vic29ja2V0LXByb3Rv Y29sLWlnbm9yZWQuaHRtbCcsCisgICAgICAgICAgICBdKSwgKCdhbmltYXRpb25zJywgWydhbmlt YXRpb25zL2tleWZyYW1lcy5odG1sJ10pLAorICAgICAgICAgICAgKCdmYXN0L2NzcycsIFsnZmFz dC9jc3MvZGlzcGxheS1ub25lLWlubGluZS1zdHlsZS1jaGFuZ2UtY3Jhc2guaHRtbCddKSwKKyAg ICAgICAgICAgICgnaHR0cC90ZXN0cy9zZWN1cml0eScsIFsnaHR0cC90ZXN0cy9zZWN1cml0eS92 aWV3LXNvdXJjZS1uby1yZWZyZXNoLmh0bWwnXSksCisgICAgICAgICAgICAoJ2h0dHAvdGVzdHMv eG1saHR0cHJlcXVlc3QnLCBbJ2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvc3VwcG9ydGVkLXht bC1jb250ZW50LXR5cGVzLmh0bWwnXSksCisgICAgICAgICAgICAoJ2lldGVzdGNlbnRlci9KYXZh c2NyaXB0JywgWydpZXRlc3RjZW50ZXIvSmF2YXNjcmlwdC8xMS4xLjVfNC00LWMtMS5odG1sJ10p LAorICAgICAgICBdKQogCiAgICAgZGVmIHRlc3Rfc2hhcmRfZXZlcnlfZmlsZShzZWxmKToKICAg ICAgICAgcmVzdWx0ID0gc2VsZi5nZXRfc2hhcmRzKG51bV93b3JrZXJzPTIsIGZ1bGx5X3BhcmFs bGVsPVRydWUpCg== 459772 2022-05-25 15:58:06 -0700 2022-05-27 00:05:26 -0700 Patch bug-228429-20220525155805.patch text/plain 2051 jbedard RnJvbSBmZjhhZTIxNWMyNGJiNGM2MTk1MDY0MDM4MWVlODc3MzljOWZhYWQzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPEpvbldCZWRhcmRAZ21haWwuY29t PgpEYXRlOiBXZWQsIDI1IE1heSAyMDIyIDE1OjU2OjQxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g W3J1bi13ZWJraXQtdGVzdHNdIFJ1biBsYXJnZXN0IHNoYXJkcyBmaXJzdAogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODQyOSA8cmRhcjovL3Byb2JsZW0vODExODQ2 Njc+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5OgooU2hhcmRl ci5fc2hhcmRfYnlfZGlyZWN0b3J5KTogQ2FwIHNoYXJkIHNpemUgYXQgMTAwIHRlc3RzLgotLS0K IC4uLi9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5ICAgICB8 IDEwICsrKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5CmluZGV4IDM1 MDIzMDZkNzdmNS4uM2U5YTFiZmE3NmRkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rl c3RfcnVubmVyLnB5CkBAIC01NDcsNiArNTQ3LDcgQEAgY2xhc3MgU2hhcmRlcihvYmplY3QpOgog ICAgICAgICByZXR1cm4gc2hhcmRzCiAKICAgICBkZWYgX3NoYXJkX2J5X2RpcmVjdG9yeShzZWxm LCB0ZXN0X2lucHV0cywgbnVtX3dvcmtlcnMpOgorICAgICAgICBNQVhfU0hBUkRfU0laRSA9IDUw CiAgICAgICAgICIiIlJldHVybnMgYSBsaXN0cyBvZiBzaGFyZHMsIGVhY2ggc2hhcmQgY29udGFp bmluZyBhbGwgdGhlIGZpbGVzIGluIGEgZGlyZWN0b3J5LgogCiAgICAgICAgIFRoaXMgaXMgdGhl IGRlZmF1bHQgbW9kZSwgYW5kIGdldHMgYXMgbXVjaCBwYXJhbGxlbGlzbSBhcyB3ZSBjYW4gd2hp bGUKQEAgLTU2MSwxMCArNTYyLDEzIEBAIGNsYXNzIFNoYXJkZXIob2JqZWN0KToKICAgICAgICAg ICAgIHRlc3RzX2J5X2RpcltkaXJlY3RvcnldLmFwcGVuZCh0ZXN0X2lucHV0KQogCiAgICAgICAg IGZvciBkaXJlY3RvcnksIHRlc3RfaW5wdXRzIGluIGl0ZXJpdGVtcyh0ZXN0c19ieV9kaXIpOgot ICAgICAgICAgICAgc2hhcmQgPSBUZXN0U2hhcmQoZGlyZWN0b3J5LCB0ZXN0X2lucHV0cykKLSAg ICAgICAgICAgIHNoYXJkcy5hcHBlbmQoc2hhcmQpCisgICAgICAgICAgICB3aGlsZSBsZW4odGVz dF9pbnB1dHMpID4gTUFYX1NIQVJEX1NJWkU6CisgICAgICAgICAgICAgICAgc2hhcmRzLmFwcGVu ZChUZXN0U2hhcmQoZGlyZWN0b3J5LCB0ZXN0X2lucHV0c1s6TUFYX1NIQVJEX1NJWkVdKSkKKyAg ICAgICAgICAgICAgICB0ZXN0X2lucHV0cyA9IHRlc3RfaW5wdXRzW01BWF9TSEFSRF9TSVpFOl0K KyAgICAgICAgICAgIHNoYXJkcy5hcHBlbmQoVGVzdFNoYXJkKGRpcmVjdG9yeSwgdGVzdF9pbnB1 dHMpKQogCi0gICAgICAgICMgU29ydCB0aGUgc2hhcmRzIGJ5IGRpcmVjdG9yeSBuYW1lLgorICAg ICAgICAjIFNvcnQgdGhlIHNoYXJkcyBieSBkaXJlY3RvcnkgbmFtZSwgdGhlbiBpbnB1dCBzaXpl LgogICAgICAgICBzaGFyZHMuc29ydChrZXk9bGFtYmRhIHNoYXJkOiBzaGFyZC5uYW1lKQorICAg ICAgICBzaGFyZHMuc29ydChrZXk9bGFtYmRhIHNoYXJkOiAtbGVuKHNoYXJkLnRlc3RfaW5wdXRz KSkKIAogICAgICAgICByZXR1cm4gc2hhcmRzCi0tIAoyLjMyLjEgKEFwcGxlIEdpdC0xMzMpCgo=