215086 2020-08-03 09:36:56 -0700 results.webkit.org: Return worker status to caller 2020-08-05 14:12:33 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain webkit-bug-importer oldest_to_newest 1677319 0 jbedard 2020-08-03 09:36:56 -0700 At the moment, the worker process has no way to know if it's actually successful in processing archives. We should return that information, instead of relying solely on exceptions. 1677323 1 jbedard 2020-08-03 09:40:34 -0700 <rdar://problem/66476525> 1677326 2 405842 jbedard 2020-08-03 09:43:35 -0700 Created attachment 405842 Patch 1677759 3 405950 jbedard 2020-08-04 15:07:58 -0700 Created attachment 405950 Patch 1677922 4 405950 aakash_jain 2020-08-05 07:03:14 -0700 Comment on attachment 405950 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405950&action=review > Tools/resultsdbpy/resultsdbpy/model/upload_context.py:200 > def do_processing_work(self): when is this function expected to return false? 1677923 5 405950 jbedard 2020-08-05 07:15:25 -0700 Comment on attachment 405950 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405950&action=review >> Tools/resultsdbpy/resultsdbpy/model/upload_context.py:200 >> def do_processing_work(self): > > when is this function expected to return false? This function should return false if no jobs are completed successfully, indicating that a given worker, for some reason, is stuck. 1678048 6 405950 aakash_jain 2020-08-05 13:01:22 -0700 Comment on attachment 405950 Patch rs=me 1678056 7 406032 jbedard 2020-08-05 13:32:17 -0700 Created attachment 406032 Patch for landing 1678079 8 ews-feeder 2020-08-05 14:12:32 -0700 Committed r265305: <https://trac.webkit.org/changeset/265305> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406032. 405842 2020-08-03 09:43:35 -0700 2020-08-04 15:07:57 -0700 Patch bug-215086-20200803094334.patch text/plain 2756 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTE5OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTA4LTAzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IFJldHVybiB3b3JrZXIgc3RhdHVzIHRv IGNhbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE1MDg2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjQ3NjUyNT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L21vZGVsL21vZGVsLnB5OgorICAgICAgICAoTW9kZWwuZG9fd29yayk6IFJldHVybiBpZiBw cm9jZXNzIGhhcyBzdWNjZXNzZnVsbHkgcHJvY2Vzc2VkIHJlc3VsdHMuCisgICAgICAgICogcmVz dWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwvdXBsb2FkX2NvbnRleHQucHk6CisgICAgICAgIChV cGxvYWRDb250ZXh0Ll9kb19qb2JfZm9yX2tleSk6IFJldHVybiBpZiB0aGUgam9iIHdhcyBzdWNj ZXNzZnVsLgorICAgICAgICAoVXBsb2FkQ29udGV4dC5kb19wcm9jZXNzaW5nX3dvcmspOiBSZXR1 cm4gdHJ1ZSBpZiBhbnkgcHJvY2Vzc2VkIGpvYnMgd2VyZSBzdWNjZXNzZnVsLgorCiAyMDIwLTA4 LTAzICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBb V1BFXVtHVEtdIHJ1bi1taW5pYnJvd3NlciBubyBsb25nZXIgYXNzdW1lcyByZWxlYXNlIGNvbmZp Z3VyYXRpb24gYnkgZGVmYXVsdApJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv bW9kZWwvbW9kZWwucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2Ri cHkvbW9kZWwvbW9kZWwucHkJKHJldmlzaW9uIDI2NTE5NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5 L3Jlc3VsdHNkYnB5L21vZGVsL21vZGVsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMjgsNyArMTI4 LDkgQEAgY2xhc3MgTW9kZWwob2JqZWN0KToKICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJv cignTm8gd29yayB0byBiZSBkb25lLCBhc3luY2hyb25vdXMgcHJvY2Vzc2luZyBkaXNhYmxlZCcp CiAKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2VsZi51cGxvYWRfY29udGV4dC5kb19wcm9j ZXNzaW5nX3dvcmsoKQorICAgICAgICAgICAgcmV0dXJuIHNlbGYudXBsb2FkX2NvbnRleHQuZG9f cHJvY2Vzc2luZ193b3JrKCkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAg ICAgICAgc3lzLnN0ZGVyci53cml0ZShmJ3t0cmFjZWJhY2suZm9ybWF0X2V4YygpfVxuJykKICAg ICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoZid7ZX1cbicpCisKKyAgICAgICAgcmV0dXJuIEZh bHNlCkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC91cGxvYWRfY29u dGV4dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2Rl bC91cGxvYWRfY29udGV4dC5weQkocmV2aXNpb24gMjY1MTk1KQorKysgVG9vbHMvcmVzdWx0c2Ri cHkvcmVzdWx0c2RicHkvbW9kZWwvdXBsb2FkX2NvbnRleHQucHkJKHdvcmtpbmcgY29weSkKQEAg LTE5NSwxOCArMTk1LDIyIEBAIGNsYXNzIFVwbG9hZENvbnRleHQob2JqZWN0KToKICAgICAgICAg ICAgICAgICAgICAganNvbi5kdW1wcyhkaWN0KHN0YXJ0ZWRfcHJvY2Vzc2luZz0wLCBhdHRlbXB0 cz1hdHRlbXB0cykpLAogICAgICAgICAgICAgICAgICAgICBleD1zZWxmLlBST0NFU1NfVElNRU9V VCwKICAgICAgICAgICAgICAgICApCisgICAgICAgIHJldHVybiBqb2JfY29tcGxldGUKIAogICAg IGRlZiBkb19wcm9jZXNzaW5nX3dvcmsoc2VsZik6CiAgICAgICAgIGpvYnNfbGVmdCA9IFRydWUK KyAgICAgICAgZGlkX2NvbXBsZXRlID0gRmFsc2UKIAogICAgICAgICB3aGlsZSBqb2JzX2xlZnQ6 CiAgICAgICAgICAgICBqb2JzX2xlZnQsIGtleSwgYXR0ZW1wdHMgPSBzZWxmLl9maW5kX2pvYl93 aXRoX2F0dGVtcHRzKCkKIAogICAgICAgICAgICAgaWYga2V5OgotICAgICAgICAgICAgICAgIHNl bGYuX2RvX2pvYl9mb3Jfa2V5KGtleSwgYXR0ZW1wdHM9YXR0ZW1wdHMpCisgICAgICAgICAgICAg ICAgZGlkX2NvbXBsZXRlIHw9IHNlbGYuX2RvX2pvYl9mb3Jfa2V5KGtleSwgYXR0ZW1wdHM9YXR0 ZW1wdHMpCiAgICAgICAgICAgICBlbGlmIGpvYnNfbGVmdDoKICAgICAgICAgICAgICAgICB0aW1l LnNsZWVwKDEwKSAgIyBUaGVyZSBhcmUgam9icywgYnV0IG90aGVyIHdvcmtlcnMgYXJlIHByb2Nl c3NpbmcgdGhlbS4KIAorICAgICAgICByZXR1cm4gZGlkX2NvbXBsZXRlCisKICAgICBkZWYgcHJv Y2Vzc190ZXN0X3Jlc3VsdHMoc2VsZiwgY29uZmlndXJhdGlvbiwgY29tbWl0cywgc3VpdGUsIHRl c3RfcmVzdWx0cywgdGltZXN0YW1wPU5vbmUpOgogICAgICAgICB0aW1lc3RhbXAgPSB0aW1lc3Rh bXAgb3IgdGltZS50aW1lKCkKIAo= 405950 2020-08-04 15:07:58 -0700 2020-08-05 13:32:15 -0700 Patch bug-215086-20200804150758.patch text/plain 5835 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTA4LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IFJldHVybiB3b3JrZXIgc3RhdHVzIHRv IGNhbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE1MDg2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjQ3NjUyNT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L21vZGVsL21vZGVsLnB5OgorICAgICAgICAoTW9kZWwuZG9fd29yayk6IFJldHVybiBpZiBw cm9jZXNzIGhhcyBzdWNjZXNzZnVsbHkgcHJvY2Vzc2VkIHJlc3VsdHMuCisgICAgICAgICogcmVz dWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwvbW9kZWxfdW5pdHRlc3QucHk6CisgICAgICAgIChN b2RlbFRlc3QudGVzdF9ub193b3JrKToKKyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJw eS9tb2RlbC91cGxvYWRfY29udGV4dC5weToKKyAgICAgICAgKFVwbG9hZENvbnRleHQuX2RvX2pv Yl9mb3Jfa2V5KTogUmV0dXJuIGlmIHRoZSBqb2Igd2FzIHN1Y2Nlc3NmdWwuCisgICAgICAgIChV cGxvYWRDb250ZXh0LmRvX3Byb2Nlc3Npbmdfd29yayk6IFJldHVybiB0cnVlIGlmIGFueSBwcm9j ZXNzZWQgam9icyB3ZXJlIHN1Y2Nlc3NmdWwuCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0 c2RicHkvbW9kZWwvdXBsb2FkX2NvbnRleHRfdW5pdHRlc3QucHk6CisgICAgICAgIChVcGxvYWRD b250ZXh0VGVzdC50ZXN0X2FzeW5jX2NhbGxiYWNrKToKKwogMjAyMC0wOC0wNCAgQ2hyaXMgRmxl aXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBWb2ljZU92ZXIgbmVl ZHMgYWNjZXNzIHRvIGZvbnQgc3R5bGluZyBhdCBpbnNlcnRpb24gcG9pbnQKSW5kZXg6IFRvb2xz L3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L21vZGVsL21vZGVsLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L21vZGVsL21vZGVsLnB5CShyZXZpc2lvbiAyNjUy NTYpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC9tb2RlbC5weQkod29y a2luZyBjb3B5KQpAQCAtMTI4LDcgKzEyOCw5IEBAIGNsYXNzIE1vZGVsKG9iamVjdCk6CiAgICAg ICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ05vIHdvcmsgdG8gYmUgZG9uZSwgYXN5bmNocm9u b3VzIHByb2Nlc3NpbmcgZGlzYWJsZWQnKQogCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHNl bGYudXBsb2FkX2NvbnRleHQuZG9fcHJvY2Vzc2luZ193b3JrKCkKKyAgICAgICAgICAgIHJldHVy biBzZWxmLnVwbG9hZF9jb250ZXh0LmRvX3Byb2Nlc3Npbmdfd29yaygpCiAgICAgICAgIGV4Y2Vw dCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoZid7dHJhY2Vi YWNrLmZvcm1hdF9leGMoKX1cbicpCiAgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKGYne2V9 XG4nKQorCisgICAgICAgIHJldHVybiBGYWxzZQpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvbW9kZWwvbW9kZWxfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVz dWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwvbW9kZWxfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2 NTI1NikKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L21vZGVsL21vZGVsX3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MywzICs0Myw4IEBAIGNsYXNzIE1vZGVsVGVzdChX YWl0Rm9yRG9ja2VyVGVzdENhc2UpOgogICAgICAgICBzZWxmLmluaXRfZGF0YWJhc2UocmVkaXM9 cmVkaXMsIGNhc3NhbmRyYT1jYXNzYW5kcmEpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxm Lm1vZGVsLmhlYWx0aHkoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHNlbGYubW9kZWwuaGVh bHRoeSh3cml0YWJsZT1GYWxzZSkpCisKKyAgICBAV2FpdEZvckRvY2tlclRlc3RDYXNlLm1vY2tf aWZfbm9fZG9ja2VyKG1vY2tfcmVkaXM9RmFrZVN0cmljdFJlZGlzLCBtb2NrX2Nhc3NhbmRyYT1N b2NrQ2Fzc2FuZHJhQ29udGV4dCkKKyAgICBkZWYgdGVzdF9ub193b3JrKHNlbGYsIHJlZGlzPVN0 cmljdFJlZGlzLCBjYXNzYW5kcmE9Q2Fzc2FuZHJhQ29udGV4dCk6CisgICAgICAgIHNlbGYuaW5p dF9kYXRhYmFzZShyZWRpcz1yZWRpcywgY2Fzc2FuZHJhPWNhc3NhbmRyYSwgYXN5bmNfcHJvY2Vz c2luZz1UcnVlKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHNlbGYubW9kZWwuZG9fd29yaygp KQpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwvdXBsb2FkX2NvbnRl eHQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwv dXBsb2FkX2NvbnRleHQucHkJKHJldmlzaW9uIDI2NTI1NikKKysrIFRvb2xzL3Jlc3VsdHNkYnB5 L3Jlc3VsdHNkYnB5L21vZGVsL3VwbG9hZF9jb250ZXh0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0x OTUsMTggKzE5NSwyMiBAQCBjbGFzcyBVcGxvYWRDb250ZXh0KG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgICAgIGpzb24uZHVtcHMoZGljdChzdGFydGVkX3Byb2Nlc3Npbmc9MCwgYXR0ZW1wdHM9 YXR0ZW1wdHMpKSwKICAgICAgICAgICAgICAgICAgICAgZXg9c2VsZi5QUk9DRVNTX1RJTUVPVVQs CiAgICAgICAgICAgICAgICAgKQorICAgICAgICByZXR1cm4gam9iX2NvbXBsZXRlCiAKICAgICBk ZWYgZG9fcHJvY2Vzc2luZ193b3JrKHNlbGYpOgogICAgICAgICBqb2JzX2xlZnQgPSBUcnVlCisg ICAgICAgIGRpZF9jb21wbGV0ZSA9IEZhbHNlCiAKICAgICAgICAgd2hpbGUgam9ic19sZWZ0Ogog ICAgICAgICAgICAgam9ic19sZWZ0LCBrZXksIGF0dGVtcHRzID0gc2VsZi5fZmluZF9qb2Jfd2l0 aF9hdHRlbXB0cygpCiAKICAgICAgICAgICAgIGlmIGtleToKLSAgICAgICAgICAgICAgICBzZWxm Ll9kb19qb2JfZm9yX2tleShrZXksIGF0dGVtcHRzPWF0dGVtcHRzKQorICAgICAgICAgICAgICAg IGRpZF9jb21wbGV0ZSB8PSBzZWxmLl9kb19qb2JfZm9yX2tleShrZXksIGF0dGVtcHRzPWF0dGVt cHRzKQogICAgICAgICAgICAgZWxpZiBqb2JzX2xlZnQ6CiAgICAgICAgICAgICAgICAgdGltZS5z bGVlcCgxMCkgICMgVGhlcmUgYXJlIGpvYnMsIGJ1dCBvdGhlciB3b3JrZXJzIGFyZSBwcm9jZXNz aW5nIHRoZW0uCiAKKyAgICAgICAgcmV0dXJuIGRpZF9jb21wbGV0ZQorCiAgICAgZGVmIHByb2Nl c3NfdGVzdF9yZXN1bHRzKHNlbGYsIGNvbmZpZ3VyYXRpb24sIGNvbW1pdHMsIHN1aXRlLCB0ZXN0 X3Jlc3VsdHMsIHRpbWVzdGFtcD1Ob25lKToKICAgICAgICAgdGltZXN0YW1wID0gdGltZXN0YW1w IG9yIHRpbWUudGltZSgpCiAKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L21v ZGVsL3VwbG9hZF9jb250ZXh0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3Vs dHNkYnB5L3Jlc3VsdHNkYnB5L21vZGVsL3VwbG9hZF9jb250ZXh0X3VuaXR0ZXN0LnB5CShyZXZp c2lvbiAyNjUyNTYpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC91cGxv YWRfY29udGV4dF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTQ4LDEyICsxNDgsMTIg QEAgY2xhc3MgVXBsb2FkQ29udGV4dFRlc3QoV2FpdEZvckRvY2tlclRlcwogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKDEsIGxlbihzZWxmLm1vZGVsLnN1aXRlX2NvbnRleHQuZmluZF9ieV9jb21t aXQoY29uZmlndXJhdGlvbnM9W0NvbmZpZ3VyYXRpb24oKV0sIHN1aXRlPSdsYXlvdXQtdGVzdHMn KSkpCiAKICAgICBAV2FpdEZvckRvY2tlclRlc3RDYXNlLm1vY2tfaWZfbm9fZG9ja2VyKG1vY2tf cmVkaXM9RmFrZVN0cmljdFJlZGlzLCBtb2NrX2Nhc3NhbmRyYT1Nb2NrQ2Fzc2FuZHJhQ29udGV4 dCkKLSAgICBkZWYgX3Rlc3RfYXN5bmNfY2FsbGJhY2soc2VsZiwgcmVkaXM9U3RyaWN0UmVkaXMs IGNhc3NhbmRyYT1DYXNzYW5kcmFDb250ZXh0KToKKyAgICBkZWYgdGVzdF9hc3luY19jYWxsYmFj ayhzZWxmLCByZWRpcz1TdHJpY3RSZWRpcywgY2Fzc2FuZHJhPUNhc3NhbmRyYUNvbnRleHQpOgog ICAgICAgICBzZWxmLmluaXRfZGF0YWJhc2UocmVkaXM9cmVkaXMsIGNhc3NhbmRyYT1jYXNzYW5k cmEsIGFzeW5jX3Byb2Nlc3Npbmc9VHJ1ZSkKICAgICAgICAgTW9ja01vZGVsRmFjdG9yeS5hZGRf bW9ja19yZXN1bHRzKHNlbGYubW9kZWwpCiAKICAgICAgICAgY29uZmlndXJhdGlvbl90b19zZWFy Y2ggPSBDb25maWd1cmF0aW9uKHBsYXRmb3JtPSdpT1MnLCB2ZXJzaW9uPScxMi4wLjAnLCBpc19z aW11bGF0b3I9VHJ1ZSwgc3R5bGU9J0FzYW4nKQotICAgICAgICBjb25maWd1cmF0aW9uLCB1cGxv YWRzID0gc2VsZi5tb2RlbC51cGxvYWRfY29udGV4dC5maW5kX3Rlc3RfcmVzdWx0cyhjb25maWd1 cmF0aW9ucz1bY29uZmlndXJhdGlvbl90b19zZWFyY2hdLCBzdWl0ZT0nbGF5b3V0LXRlc3RzJywg cmVjZW50PUZhbHNlKS5pdGVtcygpWzBdCisgICAgICAgIGNvbmZpZ3VyYXRpb24sIHVwbG9hZHMg PSBuZXh0KGl0ZXIoc2VsZi5tb2RlbC51cGxvYWRfY29udGV4dC5maW5kX3Rlc3RfcmVzdWx0cyhj b25maWd1cmF0aW9ucz1bY29uZmlndXJhdGlvbl90b19zZWFyY2hdLCBzdWl0ZT0nbGF5b3V0LXRl c3RzJywgcmVjZW50PUZhbHNlKS5pdGVtcygpKSkKICAgICAgICAgc2VsZi5tb2RlbC51cGxvYWRf Y29udGV4dC5wcm9jZXNzX3Rlc3RfcmVzdWx0cygKICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb249 Y29uZmlndXJhdGlvbiwKICAgICAgICAgICAgIGNvbW1pdHM9dXBsb2Fkc1swXVsnY29tbWl0cydd LApAQCAtMTY0LDUgKzE2NCw1IEBAIGNsYXNzIFVwbG9hZENvbnRleHRUZXN0KFdhaXRGb3JEb2Nr ZXJUZXMKIAogICAgICAgICAjIFVzaW5nIHN1aXRlIHJlc3VsdHMgYXMgYSBwcm94eSB0byB0ZWxs IGlmIGNhbGxiYWNrcyB3ZXJlIHRyaWdnZXJlZAogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAs IGxlbihzZWxmLm1vZGVsLnN1aXRlX2NvbnRleHQuZmluZF9ieV9jb21taXQoY29uZmlndXJhdGlv bnM9W0NvbmZpZ3VyYXRpb24oKV0sIHN1aXRlPSdsYXlvdXQtdGVzdHMnKSkpCi0gICAgICAgIHNl bGYubW9kZWwudXBsb2FkX2NvbnRleHQuZG9fcHJvY2Vzc2luZ193b3JrKCkKKyAgICAgICAgc2Vs Zi5hc3NlcnRUcnVlKHNlbGYubW9kZWwudXBsb2FkX2NvbnRleHQuZG9fcHJvY2Vzc2luZ193b3Jr KCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMSwgbGVuKHNlbGYubW9kZWwuc3VpdGVfY29u dGV4dC5maW5kX2J5X2NvbW1pdChjb25maWd1cmF0aW9ucz1bQ29uZmlndXJhdGlvbigpXSwgc3Vp dGU9J2xheW91dC10ZXN0cycpKSkK 406032 2020-08-05 13:32:17 -0700 2020-08-05 14:12:32 -0700 Patch for landing bug-215086-20200805133217.patch text/plain 5845 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTMwMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTA4LTA1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IFJldHVybiB3b3JrZXIgc3RhdHVzIHRv IGNhbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE1MDg2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjQ3NjUyNT4KKworICAgICAgICBSdWJi ZXItc3RhbXBlZCBieSBBYWthc2ggSmFpbi4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L21vZGVsL21vZGVsLnB5OgorICAgICAgICAoTW9kZWwuZG9fd29yayk6IFJldHVybiBp ZiBwcm9jZXNzIGhhcyBzdWNjZXNzZnVsbHkgcHJvY2Vzc2VkIHJlc3VsdHMuCisgICAgICAgICog cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwvbW9kZWxfdW5pdHRlc3QucHk6CisgICAgICAg IChNb2RlbFRlc3QudGVzdF9ub193b3JrKToKKyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRz ZGJweS9tb2RlbC91cGxvYWRfY29udGV4dC5weToKKyAgICAgICAgKFVwbG9hZENvbnRleHQuX2Rv X2pvYl9mb3Jfa2V5KTogUmV0dXJuIGlmIHRoZSBqb2Igd2FzIHN1Y2Nlc3NmdWwuCisgICAgICAg IChVcGxvYWRDb250ZXh0LmRvX3Byb2Nlc3Npbmdfd29yayk6IFJldHVybiB0cnVlIGlmIGFueSBw cm9jZXNzZWQgam9icyB3ZXJlIHN1Y2Nlc3NmdWwuCisgICAgICAgICogcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvbW9kZWwvdXBsb2FkX2NvbnRleHRfdW5pdHRlc3QucHk6CisgICAgICAgIChVcGxv YWRDb250ZXh0VGVzdC50ZXN0X2FzeW5jX2NhbGxiYWNrKToKKwogMjAyMC0wOC0wNSAgU2lodWkg TGl1ICA8c2lodWlfbGl1QGFwcGUuY29tPgogCiAgICAgICAgIFRleHRNYW5pcHVsYXRpb25Db250 cm9sbGVyIHNob3VsZCBvYnNlcnZlIG5ld2x5IGluc2VydGVkIG9yIGRpc3BsYXllZCB0ZXh0Cklu ZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC9tb2RlbC5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC9tb2RlbC5weQkocmV2 aXNpb24gMjY1MzAxKQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwvbW9k ZWwucHkJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw3ICsxMjgsOSBAQCBjbGFzcyBNb2RlbChvYmpl Y3QpOgogICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdObyB3b3JrIHRvIGJlIGRvbmUs IGFzeW5jaHJvbm91cyBwcm9jZXNzaW5nIGRpc2FibGVkJykKIAogICAgICAgICB0cnk6Ci0gICAg ICAgICAgICBzZWxmLnVwbG9hZF9jb250ZXh0LmRvX3Byb2Nlc3Npbmdfd29yaygpCisgICAgICAg ICAgICByZXR1cm4gc2VsZi51cGxvYWRfY29udGV4dC5kb19wcm9jZXNzaW5nX3dvcmsoKQogICAg ICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRl KGYne3RyYWNlYmFjay5mb3JtYXRfZXhjKCl9XG4nKQogICAgICAgICAgICAgc3lzLnN0ZGVyci53 cml0ZShmJ3tlfVxuJykKKworICAgICAgICByZXR1cm4gRmFsc2UKSW5kZXg6IFRvb2xzL3Jlc3Vs dHNkYnB5L3Jlc3VsdHNkYnB5L21vZGVsL21vZGVsX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L21vZGVsL21vZGVsX3VuaXR0ZXN0LnB5CShy ZXZpc2lvbiAyNjUzMDEpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC9t b2RlbF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNDMsMyArNDMsOCBAQCBjbGFzcyBN b2RlbFRlc3QoV2FpdEZvckRvY2tlclRlc3RDYXNlKToKICAgICAgICAgc2VsZi5pbml0X2RhdGFi YXNlKHJlZGlzPXJlZGlzLCBjYXNzYW5kcmE9Y2Fzc2FuZHJhKQogICAgICAgICBzZWxmLmFzc2Vy dFRydWUoc2VsZi5tb2RlbC5oZWFsdGh5KCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxm Lm1vZGVsLmhlYWx0aHkod3JpdGFibGU9RmFsc2UpKQorCisgICAgQFdhaXRGb3JEb2NrZXJUZXN0 Q2FzZS5tb2NrX2lmX25vX2RvY2tlcihtb2NrX3JlZGlzPUZha2VTdHJpY3RSZWRpcywgbW9ja19j YXNzYW5kcmE9TW9ja0Nhc3NhbmRyYUNvbnRleHQpCisgICAgZGVmIHRlc3Rfbm9fd29yayhzZWxm LCByZWRpcz1TdHJpY3RSZWRpcywgY2Fzc2FuZHJhPUNhc3NhbmRyYUNvbnRleHQpOgorICAgICAg ICBzZWxmLmluaXRfZGF0YWJhc2UocmVkaXM9cmVkaXMsIGNhc3NhbmRyYT1jYXNzYW5kcmEsIGFz eW5jX3Byb2Nlc3Npbmc9VHJ1ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLm1vZGVs LmRvX3dvcmsoKSkKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L21vZGVsL3Vw bG9hZF9jb250ZXh0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L21vZGVsL3VwbG9hZF9jb250ZXh0LnB5CShyZXZpc2lvbiAyNjUzMDEpCisrKyBUb29scy9y ZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC91cGxvYWRfY29udGV4dC5weQkod29ya2luZyBj b3B5KQpAQCAtMTk1LDE4ICsxOTUsMjIgQEAgY2xhc3MgVXBsb2FkQ29udGV4dChvYmplY3QpOgog ICAgICAgICAgICAgICAgICAgICBqc29uLmR1bXBzKGRpY3Qoc3RhcnRlZF9wcm9jZXNzaW5nPTAs IGF0dGVtcHRzPWF0dGVtcHRzKSksCiAgICAgICAgICAgICAgICAgICAgIGV4PXNlbGYuUFJPQ0VT U19USU1FT1VULAogICAgICAgICAgICAgICAgICkKKyAgICAgICAgcmV0dXJuIGpvYl9jb21wbGV0 ZQogCiAgICAgZGVmIGRvX3Byb2Nlc3Npbmdfd29yayhzZWxmKToKICAgICAgICAgam9ic19sZWZ0 ID0gVHJ1ZQorICAgICAgICBkaWRfY29tcGxldGUgPSBGYWxzZQogCiAgICAgICAgIHdoaWxlIGpv YnNfbGVmdDoKICAgICAgICAgICAgIGpvYnNfbGVmdCwga2V5LCBhdHRlbXB0cyA9IHNlbGYuX2Zp bmRfam9iX3dpdGhfYXR0ZW1wdHMoKQogCiAgICAgICAgICAgICBpZiBrZXk6Ci0gICAgICAgICAg ICAgICAgc2VsZi5fZG9fam9iX2Zvcl9rZXkoa2V5LCBhdHRlbXB0cz1hdHRlbXB0cykKKyAgICAg ICAgICAgICAgICBkaWRfY29tcGxldGUgfD0gc2VsZi5fZG9fam9iX2Zvcl9rZXkoa2V5LCBhdHRl bXB0cz1hdHRlbXB0cykKICAgICAgICAgICAgIGVsaWYgam9ic19sZWZ0OgogICAgICAgICAgICAg ICAgIHRpbWUuc2xlZXAoMTApICAjIFRoZXJlIGFyZSBqb2JzLCBidXQgb3RoZXIgd29ya2VycyBh cmUgcHJvY2Vzc2luZyB0aGVtLgogCisgICAgICAgIHJldHVybiBkaWRfY29tcGxldGUKKwogICAg IGRlZiBwcm9jZXNzX3Rlc3RfcmVzdWx0cyhzZWxmLCBjb25maWd1cmF0aW9uLCBjb21taXRzLCBz dWl0ZSwgdGVzdF9yZXN1bHRzLCB0aW1lc3RhbXA9Tm9uZSk6CiAgICAgICAgIHRpbWVzdGFtcCA9 IHRpbWVzdGFtcCBvciB0aW1lLnRpbWUoKQogCkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1 bHRzZGJweS9tb2RlbC91cGxvYWRfY29udGV4dF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC91cGxvYWRfY29udGV4dF91bml0dGVz dC5weQkocmV2aXNpb24gMjY1MzAxKQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv bW9kZWwvdXBsb2FkX2NvbnRleHRfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE0OCwx MiArMTQ4LDEyIEBAIGNsYXNzIFVwbG9hZENvbnRleHRUZXN0KFdhaXRGb3JEb2NrZXJUZXMKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbCgxLCBsZW4oc2VsZi5tb2RlbC5zdWl0ZV9jb250ZXh0LmZp bmRfYnlfY29tbWl0KGNvbmZpZ3VyYXRpb25zPVtDb25maWd1cmF0aW9uKCldLCBzdWl0ZT0nbGF5 b3V0LXRlc3RzJykpKQogCiAgICAgQFdhaXRGb3JEb2NrZXJUZXN0Q2FzZS5tb2NrX2lmX25vX2Rv Y2tlcihtb2NrX3JlZGlzPUZha2VTdHJpY3RSZWRpcywgbW9ja19jYXNzYW5kcmE9TW9ja0Nhc3Nh bmRyYUNvbnRleHQpCi0gICAgZGVmIF90ZXN0X2FzeW5jX2NhbGxiYWNrKHNlbGYsIHJlZGlzPVN0 cmljdFJlZGlzLCBjYXNzYW5kcmE9Q2Fzc2FuZHJhQ29udGV4dCk6CisgICAgZGVmIHRlc3RfYXN5 bmNfY2FsbGJhY2soc2VsZiwgcmVkaXM9U3RyaWN0UmVkaXMsIGNhc3NhbmRyYT1DYXNzYW5kcmFD b250ZXh0KToKICAgICAgICAgc2VsZi5pbml0X2RhdGFiYXNlKHJlZGlzPXJlZGlzLCBjYXNzYW5k cmE9Y2Fzc2FuZHJhLCBhc3luY19wcm9jZXNzaW5nPVRydWUpCiAgICAgICAgIE1vY2tNb2RlbEZh Y3RvcnkuYWRkX21vY2tfcmVzdWx0cyhzZWxmLm1vZGVsKQogCiAgICAgICAgIGNvbmZpZ3VyYXRp b25fdG9fc2VhcmNoID0gQ29uZmlndXJhdGlvbihwbGF0Zm9ybT0naU9TJywgdmVyc2lvbj0nMTIu MC4wJywgaXNfc2ltdWxhdG9yPVRydWUsIHN0eWxlPSdBc2FuJykKLSAgICAgICAgY29uZmlndXJh dGlvbiwgdXBsb2FkcyA9IHNlbGYubW9kZWwudXBsb2FkX2NvbnRleHQuZmluZF90ZXN0X3Jlc3Vs dHMoY29uZmlndXJhdGlvbnM9W2NvbmZpZ3VyYXRpb25fdG9fc2VhcmNoXSwgc3VpdGU9J2xheW91 dC10ZXN0cycsIHJlY2VudD1GYWxzZSkuaXRlbXMoKVswXQorICAgICAgICBjb25maWd1cmF0aW9u LCB1cGxvYWRzID0gbmV4dChpdGVyKHNlbGYubW9kZWwudXBsb2FkX2NvbnRleHQuZmluZF90ZXN0 X3Jlc3VsdHMoY29uZmlndXJhdGlvbnM9W2NvbmZpZ3VyYXRpb25fdG9fc2VhcmNoXSwgc3VpdGU9 J2xheW91dC10ZXN0cycsIHJlY2VudD1GYWxzZSkuaXRlbXMoKSkpCiAgICAgICAgIHNlbGYubW9k ZWwudXBsb2FkX2NvbnRleHQucHJvY2Vzc190ZXN0X3Jlc3VsdHMoCiAgICAgICAgICAgICBjb25m aWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sCiAgICAgICAgICAgICBjb21taXRzPXVwbG9hZHNbMF1b J2NvbW1pdHMnXSwKQEAgLTE2NCw1ICsxNjQsNSBAQCBjbGFzcyBVcGxvYWRDb250ZXh0VGVzdChX YWl0Rm9yRG9ja2VyVGVzCiAKICAgICAgICAgIyBVc2luZyBzdWl0ZSByZXN1bHRzIGFzIGEgcHJv eHkgdG8gdGVsbCBpZiBjYWxsYmFja3Mgd2VyZSB0cmlnZ2VyZWQKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbCgwLCBsZW4oc2VsZi5tb2RlbC5zdWl0ZV9jb250ZXh0LmZpbmRfYnlfY29tbWl0KGNv bmZpZ3VyYXRpb25zPVtDb25maWd1cmF0aW9uKCldLCBzdWl0ZT0nbGF5b3V0LXRlc3RzJykpKQot ICAgICAgICBzZWxmLm1vZGVsLnVwbG9hZF9jb250ZXh0LmRvX3Byb2Nlc3Npbmdfd29yaygpCisg ICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLm1vZGVsLnVwbG9hZF9jb250ZXh0LmRvX3Byb2Nl c3Npbmdfd29yaygpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDEsIGxlbihzZWxmLm1vZGVs LnN1aXRlX2NvbnRleHQuZmluZF9ieV9jb21taXQoY29uZmlndXJhdGlvbnM9W0NvbmZpZ3VyYXRp b24oKV0sIHN1aXRlPSdsYXlvdXQtdGVzdHMnKSkpCg==