75958 2012-01-10 06:40:24 -0800 nrwt should use multiple http shards 2012-01-13 11:55:32 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63116 1 kkristof webkit-unassigned abarth dpranke ojan ossy webkit.review.bot oldest_to_newest 533021 0 kkristof 2012-01-10 06:40:24 -0800 We ran some tests with multiple http shards on the Qt port and it seems stable, we haven't met any flaky http test. Maybe we can allow it by default or if the other ports still have problems with it we can make an option like --max-http-shards=i and set it's default value to 1. 533233 1 dpranke 2012-01-10 11:29:21 -0800 Sure, that seems fine. Feel free to add a patch, or I will get around to it sooner or later. 533734 2 121992 kkristof 2012-01-11 01:12:50 -0800 Created attachment 121992 add --max-locked-shard option I added the option to set it manual so now we can test it easier. 533866 3 121992 ossy 2012-01-11 07:00:06 -0800 Comment on attachment 121992 add --max-locked-shard option View in context: https://bugs.webkit.org/attachment.cgi?id=121992&action=review LGTM. Any objection? > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:383 > + help="Set the maximum of locked shards"), only a little nit: "Maximum number of locked shards" 533990 4 121992 ojan 2012-01-11 10:14:46 -0800 Comment on attachment 121992 add --max-locked-shard option View in context: https://bugs.webkit.org/attachment.cgi?id=121992&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:679 > + if self._options.max_locked_shards: > + num_of_locked_shards = self._options.max_locked_shards > + else: > + num_of_locked_shards = 1 How about adding a boolean option instead (e.g. --shard-http-tests)? Then we can return "max(math.ceil(num_workers / 4.0), 1)" and tweak that math until we get reasonable stability. 534758 5 ossy 2012-01-12 05:21:19 -0800 (In reply to comment #4) > How about adding a boolean option instead (e.g. --shard-http-tests)? Then we can return "max(math.ceil(num_workers / 4.0), 1)" and tweak that math until we get reasonable stability. I prefer the integer parameter, which let us use what we want. max(math.ceil(num_workers / 4.0) wouldn't be good for 4 or 8 workers, because 1 or 2 http shards isn't so useful ... I think num_of_locked_shards should be an integer option now, and we can move forward to increase the default value of it. 534770 6 122223 kkristof 2012-01-12 05:52:01 -0800 Created attachment 122223 add --max-locked-shard option I fixed the grammar issues :) 534780 7 122223 ossy 2012-01-12 06:20:28 -0800 Comment on attachment 122223 add --max-locked-shard option Let's go forward, r=me. 534782 8 122223 ossy 2012-01-12 06:28:29 -0800 Comment on attachment 122223 add --max-locked-shard option r-, because it broke a unittest. :-/ ERROR: test_shard_by_dir (webkitpy.layout_tests.controllers.manager_unittest.ShardingTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/oszi/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py", line 82, in test_shard_by_dir locked, unlocked = self.get_shards(num_workers=2, fully_parallel=False) File "/home/oszi/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py", line 79, in get_shards return self.manager._shard_tests(test_list, num_workers, fully_parallel) File "/home/oszi/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 593, in _shard_tests return self._shard_by_directory(test_files, num_workers) File "/home/oszi/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 664, in _shard_by_directory 'locked_shard'), File "/home/oszi/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 706, in _resize_shards num_old_per_new = divide_and_round_up(len(old_shards), max_new_shards) File "/home/oszi/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 695, in divide_and_round_up return int(math.ceil(float(numerator) / divisor)) TypeError: unsupported operand type(s) for /: 'float' and 'Mock' Could you check it and fix? 535591 9 122412 kkristof 2012-01-13 04:56:28 -0800 Created attachment 122412 add --max-locked-shard option I fixed the unit test sorry about that, and I also write a new unit test for test it works properly. 535867 10 122412 webkit.review.bot 2012-01-13 11:55:26 -0800 Comment on attachment 122412 add --max-locked-shard option Clearing flags on attachment: 122412 Committed r104967: <http://trac.webkit.org/changeset/104967> 535868 11 webkit.review.bot 2012-01-13 11:55:32 -0800 All reviewed patches have been landed. Closing bug. 121992 2012-01-11 01:12:50 -0800 2012-01-12 05:52:01 -0800 add --max-locked-shard option 0111.patch text/plain 2642 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNmRl MGZmLi5jOGIxMjNmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDEtMTEgIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIG5yd3Qgc2hvdWxkIHVzZSBtdWx0 aXBsZSBodHRwIHNoYXJkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzU5NTgKKworICAgICAgICBBZGQgLS1tYXgtbG9ja2VkLXNoYXJkcyBvcHRpb24g dG8gdGhlIG5yd3QgZm9yIG1hbnVhbCBzZXQKKyAgICAgICAgdGhlIG1heGltdW0gb2YgdGhlIGxv Y2tlZCBzaGFyZHMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIu cHk6CisgICAgICAgIChNYW5hZ2VyLl9tYXhfbG9ja2VkX3NoYXJkcyk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAg KHBhcnNlX2FyZ3MpOgorCiAyMDEyLTAxLTEwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRkIFRlc3RXZWJLaXRBUEkgdGVzdHMgZm9yIEtVUkwKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy9tYW5hZ2VyLnB5CmluZGV4IGFmZjYwNDguLjc2Y2NiYTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5w eQpAQCAtNjY4LDExICs2NjgsMTcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAj IFB1dCBhIGNlaWxpbmcgb24gdGhlIG51bWJlciBvZiBsb2NrZWQgc2hhcmRzLCBzbyB0aGF0IHdl CiAgICAgICAgICMgZG9uJ3QgaGFtbWVyIHRoZSBzZXJ2ZXJzIHRvbyBiYWRseS4KIAotICAgICAg ICAjIEZJWE1FOiBGb3Igbm93LCBsaW1pdCB0byBvbmUgc2hhcmQuIEFmdGVyIHRlc3RpbmcgdG8g bWFrZSBzdXJlIHdlCisgICAgICAgICMgRklYTUU6IEZvciBub3csIGxpbWl0IHRvIG9uZSBzaGFy ZCBvciBzZXQgaXQKKyAgICAgICAgIyB3aXRoIHRoZSAtLW1heC1sb2NrZWQtc2hhcmRzLiBBZnRl ciB0ZXN0aW5nIHRvIG1ha2Ugc3VyZSB3ZQogICAgICAgICAjIGNhbiBoYW5kbGUgbXVsdGlwbGUg c2hhcmRzLCB3ZSBzaG91bGQgcHJvYmFibHkgZG8gc29tZXRoaW5nIGxpa2UKICAgICAgICAgIyBs aW1pdCB0aGlzIHRvIG5vIG1vcmUgdGhhbiBhIHF1YXJ0ZXIgb2YgYWxsIHdvcmtlcnMsIGUuZy46 CiAgICAgICAgICMgcmV0dXJuIG1heChtYXRoLmNlaWwobnVtX3dvcmtlcnMgLyA0LjApLCAxKQot ICAgICAgICByZXR1cm4gMQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLm1heF9sb2NrZWRfc2hh cmRzOgorICAgICAgICAgICAgbnVtX29mX2xvY2tlZF9zaGFyZHMgPSBzZWxmLl9vcHRpb25zLm1h eF9sb2NrZWRfc2hhcmRzCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBudW1fb2ZfbG9ja2Vk X3NoYXJkcyA9IDEKKworICAgICAgICByZXR1cm4gbnVtX29mX2xvY2tlZF9zaGFyZHMKIAogICAg IGRlZiBfcmVzaXplX3NoYXJkcyhzZWxmLCBvbGRfc2hhcmRzLCBtYXhfbmV3X3NoYXJkcywgc2hh cmRfbmFtZV9wcmVmaXgpOgogICAgICAgICAiIiJUYWtlcyBhIGxpc3Qgb2Ygc2hhcmRzIGFuZCBy ZWRpc3RyaWJ1dGVzIHRoZSB0ZXN0cyBpbnRvIG5vIG1vcmUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDli NDg1NTcuLmUxYzNhNDIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMzc5LDYgKzM3OSw4IEBAIGRlZiBw YXJzZV9hcmdzKGFyZ3M9Tm9uZSk6CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5v LXJldHJ5LWZhaWx1cmVzIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsCiAgICAgICAgICAgICBkZXN0 PSJyZXRyeV9mYWlsdXJlcyIsCiAgICAgICAgICAgICBoZWxwPSJEb24ndCByZS10cnkgYW55IHRl c3RzIHRoYXQgcHJvZHVjZSB1bmV4cGVjdGVkIHJlc3VsdHMuIiksCisgICAgICAgIG9wdHBhcnNl Lm1ha2Vfb3B0aW9uKCItLW1heC1sb2NrZWQtc2hhcmRzIiwgdHlwZT0iaW50IiwKKyAgICAgICAg ICAgIGhlbHA9IlNldCB0aGUgbWF4aW11bSBvZiBsb2NrZWQgc2hhcmRzIiksCiAgICAgXQogCiAg ICAgbWlzY19vcHRpb25zID0gWwo= 122223 2012-01-12 05:52:01 -0800 2012-01-13 04:56:28 -0800 add --max-locked-shard option 0112.patch text/plain 2715 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0Yzky OWJkLi4zZmQ3MTQ4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDEtMTIgIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIG5yd3Qgc2hvdWxkIHVzZSBtdWx0 aXBsZSBodHRwIHNoYXJkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzU5NTgKKworICAgICAgICBBZGQgLS1tYXgtbG9ja2VkLXNoYXJkcyBvcHRpb24g dG8gdGhlIG5yd3QgZm9yIG1hbnVhbCBzZXQKKyAgICAgICAgdGhlIG1heGltdW0gbnVtYmVyIG9m IHRoZSBsb2NrZWQgc2hhcmRzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9t YW5hZ2VyLnB5OgorICAgICAgICAoTWFuYWdlci5fbWF4X2xvY2tlZF9zaGFyZHMpOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6Cisg ICAgICAgIChwYXJzZV9hcmdzKToKKwogMjAxMi0wMS0xMiAgVnNldm9sb2QgVmxhc292ICA8dnNl dmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWJLaXRUZXN0UnVubmVyIHNob3VsZCBub3Qg cHJpbnQgY29uc29sZSBtZXNzYWdlIGxpbmUgbnVtYmVyIHdoZW4gaXQgaXMgZXF1YWwgdG8gemVy by4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL21hbmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyLnB5CmluZGV4IGFmZjYwNDguLjc2Y2NiYTUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlci5weQpAQCAtNjY4LDExICs2NjgsMTcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgog ICAgICAgICAjIFB1dCBhIGNlaWxpbmcgb24gdGhlIG51bWJlciBvZiBsb2NrZWQgc2hhcmRzLCBz byB0aGF0IHdlCiAgICAgICAgICMgZG9uJ3QgaGFtbWVyIHRoZSBzZXJ2ZXJzIHRvbyBiYWRseS4K IAotICAgICAgICAjIEZJWE1FOiBGb3Igbm93LCBsaW1pdCB0byBvbmUgc2hhcmQuIEFmdGVyIHRl c3RpbmcgdG8gbWFrZSBzdXJlIHdlCisgICAgICAgICMgRklYTUU6IEZvciBub3csIGxpbWl0IHRv IG9uZSBzaGFyZCBvciBzZXQgaXQKKyAgICAgICAgIyB3aXRoIHRoZSAtLW1heC1sb2NrZWQtc2hh cmRzLiBBZnRlciB0ZXN0aW5nIHRvIG1ha2Ugc3VyZSB3ZQogICAgICAgICAjIGNhbiBoYW5kbGUg bXVsdGlwbGUgc2hhcmRzLCB3ZSBzaG91bGQgcHJvYmFibHkgZG8gc29tZXRoaW5nIGxpa2UKICAg ICAgICAgIyBsaW1pdCB0aGlzIHRvIG5vIG1vcmUgdGhhbiBhIHF1YXJ0ZXIgb2YgYWxsIHdvcmtl cnMsIGUuZy46CiAgICAgICAgICMgcmV0dXJuIG1heChtYXRoLmNlaWwobnVtX3dvcmtlcnMgLyA0 LjApLCAxKQotICAgICAgICByZXR1cm4gMQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLm1heF9s b2NrZWRfc2hhcmRzOgorICAgICAgICAgICAgbnVtX29mX2xvY2tlZF9zaGFyZHMgPSBzZWxmLl9v cHRpb25zLm1heF9sb2NrZWRfc2hhcmRzCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBudW1f b2ZfbG9ja2VkX3NoYXJkcyA9IDEKKworICAgICAgICByZXR1cm4gbnVtX29mX2xvY2tlZF9zaGFy ZHMKIAogICAgIGRlZiBfcmVzaXplX3NoYXJkcyhzZWxmLCBvbGRfc2hhcmRzLCBtYXhfbmV3X3No YXJkcywgc2hhcmRfbmFtZV9wcmVmaXgpOgogICAgICAgICAiIiJUYWtlcyBhIGxpc3Qgb2Ygc2hh cmRzIGFuZCByZWRpc3RyaWJ1dGVzIHRoZSB0ZXN0cyBpbnRvIG5vIG1vcmUKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 CmluZGV4IDliNDg1NTcuLmI2MDY4YjYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMzc5LDYgKzM3OSw4 IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9uZSk6CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCItLW5vLXJldHJ5LWZhaWx1cmVzIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsCiAgICAgICAg ICAgICBkZXN0PSJyZXRyeV9mYWlsdXJlcyIsCiAgICAgICAgICAgICBoZWxwPSJEb24ndCByZS10 cnkgYW55IHRlc3RzIHRoYXQgcHJvZHVjZSB1bmV4cGVjdGVkIHJlc3VsdHMuIiksCisgICAgICAg IG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW1heC1sb2NrZWQtc2hhcmRzIiwgdHlwZT0iaW50IiwK KyAgICAgICAgICAgIGhlbHA9IlNldCB0aGUgbWF4aW11bSBudW1iZXIgb2YgbG9ja2VkIHNoYXJk cyIpLAogICAgIF0KIAogICAgIG1pc2Nfb3B0aW9ucyA9IFsK 122412 2012-01-13 04:56:28 -0800 2012-01-13 11:55:26 -0800 add --max-locked-shard option 0113.patch text/plain 5354 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4N2Rj MGU1Li5iNWI5NmVjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDEtMTMgIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIG5yd3Qgc2hvdWxkIHVzZSBtdWx0 aXBsZSBodHRwIHNoYXJkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzU5NTgKKworICAgICAgICBBZGQgLS1tYXgtbG9ja2VkLXNoYXJkcyBvcHRpb24g dG8gdGhlIG5yd3QgZm9yIG1hbnVhbCBzZXQKKyAgICAgICAgdGhlIG1heGltdW0gbnVtYmVyIG9m IHRoZSBsb2NrZWQgc2hhcmRzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9t YW5hZ2VyLnB5OgorICAgICAgICAoTWFuYWdlci5fbWF4X2xvY2tlZF9zaGFyZHMpOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5p dHRlc3QucHk6CisgICAgICAgIChTaGFyZGluZ1Rlc3RzLmdldF9zaGFyZHMpOgorICAgICAgICAo U2hhcmRpbmdUZXN0cy50ZXN0X211bHRpcGxlX2xvY2tlZF9zaGFyZHMpOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAg IChwYXJzZV9hcmdzKToKKwogMjAxMi0wMS0xMyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXVJFR1JFU1NJT04ocjEwNDg4MSk6SXQgYnJv a2UgaHVuZHJlZHMgb2YgdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CmluZGV4IGFmZjYwNDguLjc2 Y2NiYTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAtNjY4LDExICs2NjgsMTcgQEAgY2xhc3Mg TWFuYWdlcihvYmplY3QpOgogICAgICAgICAjIFB1dCBhIGNlaWxpbmcgb24gdGhlIG51bWJlciBv ZiBsb2NrZWQgc2hhcmRzLCBzbyB0aGF0IHdlCiAgICAgICAgICMgZG9uJ3QgaGFtbWVyIHRoZSBz ZXJ2ZXJzIHRvbyBiYWRseS4KIAotICAgICAgICAjIEZJWE1FOiBGb3Igbm93LCBsaW1pdCB0byBv bmUgc2hhcmQuIEFmdGVyIHRlc3RpbmcgdG8gbWFrZSBzdXJlIHdlCisgICAgICAgICMgRklYTUU6 IEZvciBub3csIGxpbWl0IHRvIG9uZSBzaGFyZCBvciBzZXQgaXQKKyAgICAgICAgIyB3aXRoIHRo ZSAtLW1heC1sb2NrZWQtc2hhcmRzLiBBZnRlciB0ZXN0aW5nIHRvIG1ha2Ugc3VyZSB3ZQogICAg ICAgICAjIGNhbiBoYW5kbGUgbXVsdGlwbGUgc2hhcmRzLCB3ZSBzaG91bGQgcHJvYmFibHkgZG8g c29tZXRoaW5nIGxpa2UKICAgICAgICAgIyBsaW1pdCB0aGlzIHRvIG5vIG1vcmUgdGhhbiBhIHF1 YXJ0ZXIgb2YgYWxsIHdvcmtlcnMsIGUuZy46CiAgICAgICAgICMgcmV0dXJuIG1heChtYXRoLmNl aWwobnVtX3dvcmtlcnMgLyA0LjApLCAxKQotICAgICAgICByZXR1cm4gMQorICAgICAgICBpZiBz ZWxmLl9vcHRpb25zLm1heF9sb2NrZWRfc2hhcmRzOgorICAgICAgICAgICAgbnVtX29mX2xvY2tl ZF9zaGFyZHMgPSBzZWxmLl9vcHRpb25zLm1heF9sb2NrZWRfc2hhcmRzCisgICAgICAgIGVsc2U6 CisgICAgICAgICAgICBudW1fb2ZfbG9ja2VkX3NoYXJkcyA9IDEKKworICAgICAgICByZXR1cm4g bnVtX29mX2xvY2tlZF9zaGFyZHMKIAogICAgIGRlZiBfcmVzaXplX3NoYXJkcyhzZWxmLCBvbGRf c2hhcmRzLCBtYXhfbmV3X3NoYXJkcywgc2hhcmRfbmFtZV9wcmVmaXgpOgogICAgICAgICAiIiJU YWtlcyBhIGxpc3Qgb2Ygc2hhcmRzIGFuZCByZWRpc3RyaWJ1dGVzIHRoZSB0ZXN0cyBpbnRvIG5v IG1vcmUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CmluZGV4IDk4ZGIyZmMu LjFmYjEwZGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weQpAQCAtNjks MTMgKzY5LDEzIEBAIGNsYXNzIFNoYXJkaW5nVGVzdHModW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICAiZG9tL2h0bWwvbGV2ZWwyL2h0bWwvSFRNTEFuY2hvckVsZW1lbnQwNi5odG1sIiwKICAg ICBdCiAKLSAgICBkZWYgZ2V0X3NoYXJkcyhzZWxmLCBudW1fd29ya2VycywgZnVsbHlfcGFyYWxs ZWwsIHRlc3RfbGlzdD1Ob25lKToKKyAgICBkZWYgZ2V0X3NoYXJkcyhzZWxmLCBudW1fd29ya2Vy cywgZnVsbHlfcGFyYWxsZWwsIHRlc3RfbGlzdD1Ob25lLCBtYXhfbG9ja2VkX3NoYXJkcz1Ob25l KToKICAgICAgICAgdGVzdF9saXN0ID0gdGVzdF9saXN0IG9yIHNlbGYudGVzdF9saXN0CiAgICAg ICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAgICAgIHBvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5n ZXQocG9ydF9uYW1lPSd0ZXN0JykKICAgICAgICAgcG9ydC5fZmlsZXN5c3RlbSA9IE1vY2tGaWxl U3lzdGVtKCkKLSAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIE1vY2tPcHRpb25zKCkg aW5zdGVhZCBvZiBNb2NrKCkKLSAgICAgICAgc2VsZi5tYW5hZ2VyID0gTWFuYWdlcldyYXBwZXIo cG9ydD1wb3J0LCBvcHRpb25zPU1vY2soKSwgcHJpbnRlcj1Nb2NrKCkpCisgICAgICAgIG9wdGlv bnMgPSBNb2NrT3B0aW9ucyhtYXhfbG9ja2VkX3NoYXJkcz1tYXhfbG9ja2VkX3NoYXJkcykKKyAg ICAgICAgc2VsZi5tYW5hZ2VyID0gTWFuYWdlcldyYXBwZXIocG9ydD1wb3J0LCBvcHRpb25zPW9w dGlvbnMsIHByaW50ZXI9TW9jaygpKQogICAgICAgICByZXR1cm4gc2VsZi5tYW5hZ2VyLl9zaGFy ZF90ZXN0cyh0ZXN0X2xpc3QsIG51bV93b3JrZXJzLCBmdWxseV9wYXJhbGxlbCkKIAogICAgIGRl ZiB0ZXN0X3NoYXJkX2J5X2RpcihzZWxmKToKQEAgLTE0Myw2ICsxNDMsMjQgQEAgY2xhc3MgU2hh cmRpbmdUZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KGxlbihsb2NrZWQpLCAxKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4odW5sb2NrZWQp LCAwKQogCisgICAgZGVmIHRlc3RfbXVsdGlwbGVfbG9ja2VkX3NoYXJkcyhzZWxmKToKKyAgICAg ICAgbG9ja2VkLCB1bmxvY2tlZCA9IHNlbGYuZ2V0X3NoYXJkcyhudW1fd29ya2Vycz00LCBmdWxs eV9wYXJhbGxlbD1GYWxzZSwgbWF4X2xvY2tlZF9zaGFyZHM9MikKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChsb2NrZWQsCisgICAgICAgICAgICBbVGVzdFNoYXJkKCdsb2NrZWRfc2hhcmRfMScs CisgICAgICAgICAgICAgICAgICAgICAgIFsnaHR0cC90ZXN0cy9zZWN1cml0eS92aWV3LXNvdXJj ZS1uby1yZWZyZXNoLmh0bWwnLAorICAgICAgICAgICAgICAgICAgICAgICAgJ2h0dHAvdGVzdHMv d2Vic29ja2V0L3Rlc3RzL3VuaWNvZGUuaHRtJywKKyAgICAgICAgICAgICAgICAgICAgICAgICdo dHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy93ZWJzb2NrZXQtcHJvdG9jb2wtaWdub3JlZC5odG1s J10pLAorICAgICAgICAgICAgIFRlc3RTaGFyZCgnbG9ja2VkX3NoYXJkXzInLAorICAgICAgICAg ICAgICAgICAgICAgICAgWydodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3N1cHBvcnRlZC14bWwt Y29udGVudC10eXBlcy5odG1sJ10pXSkKKworICAgICAgICBsb2NrZWQsIHVubG9ja2VkID0gc2Vs Zi5nZXRfc2hhcmRzKG51bV93b3JrZXJzPTQsIGZ1bGx5X3BhcmFsbGVsPUZhbHNlKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhsb2NrZWQsCisgICAgICAgICAgICBbVGVzdFNoYXJkKCdsb2Nr ZWRfc2hhcmRfMScsCisgICAgICAgICAgICAgICAgICAgICAgIFsnaHR0cC90ZXN0cy9zZWN1cml0 eS92aWV3LXNvdXJjZS1uby1yZWZyZXNoLmh0bWwnLAorICAgICAgICAgICAgICAgICAgICAgICAg J2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VuaWNvZGUuaHRtJywKKyAgICAgICAgICAgICAg ICAgICAgICAgICdodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy93ZWJzb2NrZXQtcHJvdG9jb2wt aWdub3JlZC5odG1sJywKKyAgICAgICAgICAgICAgICAgICAgICAgICdodHRwL3Rlc3RzL3htbGh0 dHByZXF1ZXN0L3N1cHBvcnRlZC14bWwtY29udGVudC10eXBlcy5odG1sJ10pXSkKKwogCiBjbGFz cyBNYW5hZ2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIGdldF9vcHRpb25zKHNl bGYpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHMucHkKaW5kZXggOWI0ODU1Ny4uYjYwNjhiNiAxMDA3NTUKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 CkBAIC0zNzksNiArMzc5LDggQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25lKToKICAgICAgICAg b3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbm8tcmV0cnktZmFpbHVyZXMiLCBhY3Rpb249InN0b3Jl X2ZhbHNlIiwKICAgICAgICAgICAgIGRlc3Q9InJldHJ5X2ZhaWx1cmVzIiwKICAgICAgICAgICAg IGhlbHA9IkRvbid0IHJlLXRyeSBhbnkgdGVzdHMgdGhhdCBwcm9kdWNlIHVuZXhwZWN0ZWQgcmVz dWx0cy4iKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbWF4LWxvY2tlZC1zaGFy ZHMiLCB0eXBlPSJpbnQiLAorICAgICAgICAgICAgaGVscD0iU2V0IHRoZSBtYXhpbXVtIG51bWJl ciBvZiBsb2NrZWQgc2hhcmRzIiksCiAgICAgXQogCiAgICAgbWlzY19vcHRpb25zID0gWwo=