226238 2021-05-25 13:05:26 -0700 [webkitcorey] Gracefully handle CNTRL-C in TaskPool 2021-05-27 19:27:08 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226234 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu slewis webkit-bug-importer oldest_to_newest 1763643 0 jbedard 2021-05-25 13:05:26 -0700 When a user CNTRL-C's a Python application, that signal is forwarded to all child processes. This works well, until it's time to tear down the queue between processes, when Python starts logging error messages about broken pipes. We want to suppress these error messages, but also allow the TaskPool to be re-used. 1763644 1 webkit-bug-importer 2021-05-25 13:05:46 -0700 <rdar://problem/78472148> 1763664 2 429689 jbedard 2021-05-25 13:37:03 -0700 Created attachment 429689 Patch 1763942 3 429765 jbedard 2021-05-26 09:36:11 -0700 Created attachment 429765 Patch 1764542 4 429765 dewei_zhu 2021-05-27 15:29:53 -0700 Comment on attachment 429765 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429765&action=review > Tools/ChangeLog:13 > + (TaskPool.__init__): Defer worker and queue construction to context manager. Could you tell me more about this deferral? > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py:-335 > - from mock import patch Could you tell me more about this change? I think this was for making unit tests happy? 1764549 5 429765 jbedard 2021-05-27 15:37:23 -0700 Comment on attachment 429765 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429765&action=review >> Tools/ChangeLog:13 >> + (TaskPool.__init__): Defer worker and queue construction to context manager. > > Could you tell me more about this deferral? The point of this deferral is so that we never have unusable but instantiated queues. Basically, if children processes receive a CNTRL-C, the queues in the parent process will end up with broken pipes. We then need to close, clean up and re-construct those queues. Given that the queues and workers aren't really valid until we start them in the first place, it seemed best to tie both the queue and the workers directly to the context manager. >> Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py:-335 >> - from mock import patch > > Could you tell me more about this change? I think this was for making unit tests happy? Oh, oops, yeah, I should put that back in. My IDE said it was unused, and I wasn't paying attention 1764555 6 429945 jbedard 2021-05-27 15:48:12 -0700 Created attachment 429945 Patch 1764580 7 429945 dewei_zhu 2021-05-27 16:41:56 -0700 Comment on attachment 429945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429945&action=review r=me > Tools/ChangeLog:13 > + (TaskPool.__init__): Defer worker and queue construction to context manager. Might be useful to mention why we want to do this. 1764613 8 429969 jbedard 2021-05-27 18:03:27 -0700 Created attachment 429969 Patch for landing 1764641 9 ews-feeder 2021-05-27 19:27:07 -0700 Committed r278187 (238230@main): <https://commits.webkit.org/238230@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429969. 429689 2021-05-25 13:37:03 -0700 2021-05-26 09:36:09 -0700 Patch bug-226238-20210525133702.patch text/plain 5377 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODAzNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIxLTA1LTI1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXldIEdyYWNlZnVsbHkgaGFuZGxlIENOVFJMLUMgaW4g VGFza1Bvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNjIzOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg0NzIxNDg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rhc2tfcG9vbC5weToKKyAgICAgICAgKF9CaURpcmVj dGlvbmFsUXVldWUuY2xvc2UpOiBUZWFyLWRvd24gcXVldWUgb2JqZWN0cyB3aGlsZSBzdXBwcmVz c2luZyBhbnkgbG9nZ2luZy4KKyAgICAgICAgKF9Qcm9jZXNzLmhhbmRsZXIpOiBCb3RoIFNJR1RF Uk0gYW5kIFNJR0lOVCBzaWduYWxzIHNob3VsZCBzdG9wIHdvcmtlciBwcm9jZXNzZXMuCisgICAg ICAgIChfUHJvY2Vzcy5tYWluKTogQWRkIFNJR0lOVCBoYW5kbGVyLCBleHBsaWNpdGx5IGNsb3Nl IHF1ZXVlLgorICAgICAgICAoVGFza1Bvb2wuX19pbml0X18pOiBEZWZlciB3b3JrZXIgYW5kIHF1 ZXVlIGNvbnN0cnVjdGlvbiB0byBjb250ZXh0IG1hbmFnZXIuCisgICAgICAgIChUYXNrUG9vbC5f X2VudGVyX18pOiBDb25zdHJ1Y3Qgd29ya2VyIHByb2Nlc3Nlcy4KKyAgICAgICAgKFRhc2tQb29s LmRvKTogT25seSBjYXRjaCBRdWV1ZS5FbXB0eSBleGNlcHRpb24uCisgICAgICAgIChUYXNrUG9v bC5fX2V4aXRfXyk6IEV4cGxpY2l0bHkgY2xvc2UgcXVldWUsIHJlc2V0IHdvcmtlcnMgYW5kIHF1 ZXVlLgorCiAyMDIxLTA1LTI0ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAg ICAgICBTd2l0Y2ggZnJvbSBXVEY6Ok9wdGlvbmFsIHRvIHN0ZDo6b3B0aW9uYWwKSW5kZXg6IFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdGFza19wb29s LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93 ZWJraXRjb3JlcHkvdGFza19wb29sLnB5CShyZXZpc2lvbiAyNzgwMzcpCisrKyBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rhc2tfcG9vbC5weQkod29y a2luZyBjb3B5KQpAQCAtMjcsNiArMjcsOCBAQCBpbXBvcnQgbXVsdGlwcm9jZXNzaW5nCiBpbXBv cnQgc2lnbmFsCiBpbXBvcnQgc3lzCiAKK2ltcG9ydCBxdWV1ZSBhcyBRdWV1ZQorCiBmcm9tIHdl YmtpdGNvcmVweSBpbXBvcnQgT3V0cHV0Q2FwdHVyZSwgVGltZW91dCwgbG9nCiAKIApAQCAtMTQ2 LDYgKzE0OCwxMyBAQCBjbGFzcyBfQmlEaXJlY3Rpb25hbFF1ZXVlKG9iamVjdCk6CiAgICAgICAg ICAgICAgICAgcmV0dXJuIHNlbGYuaW5jb21pbmcuZ2V0KHRpbWVvdXQ9ZGlmZmVyZW5jZSkKICAg ICAgICAgICAgIHJldHVybiBzZWxmLmluY29taW5nLmdldCgpCiAKKyAgICBkZWYgY2xvc2Uoc2Vs Zik6CisgICAgICAgIHdpdGggT3V0cHV0Q2FwdHVyZSgpOgorICAgICAgICAgICAgc2VsZi5vdXRn b2luZy5jbG9zZSgpCisgICAgICAgICAgICBzZWxmLmluY29taW5nLmNsb3NlKCkKKyAgICAgICAg ICAgIHNlbGYub3V0Z29pbmcuam9pbl90aHJlYWQoKQorICAgICAgICAgICAgc2VsZi5pbmNvbWlu Zy5qb2luX3RocmVhZCgpCisKIAogY2xhc3MgX1Byb2Nlc3Mob2JqZWN0KToKICAgICBuYW1lID0g Tm9uZQpAQCAtMjI4LDcgKzIzNyw3IEBAIGNsYXNzIF9Qcm9jZXNzKG9iamVjdCk6CiAKICAgICBA Y2xhc3NtZXRob2QKICAgICBkZWYgaGFuZGxlcihjbHMsIHZhbHVlLCBfKToKLSAgICAgICAgaWYg dmFsdWUgPT0gZ2V0YXR0cihzaWduYWwsICdTSUdURVJNJyk6CisgICAgICAgIGlmIHZhbHVlIGlu IChnZXRhdHRyKHNpZ25hbCwgJ1NJR1RFUk0nKSwgZ2V0YXR0cihzaWduYWwsICdTSUdJTlQnKSk6 CiAgICAgICAgICAgICBjbHMud29ya2luZyA9IEZhbHNlCiAKICAgICBAY2xhc3NtZXRob2QKQEAg LTI0Niw2ICsyNTUsOCBAQCBjbGFzcyBfUHJvY2VzcyhvYmplY3QpOgogCiAgICAgICAgIGlmIGdl dGF0dHIoc2lnbmFsLCAnU0lHVEVSTScpOgogICAgICAgICAgICAgc2lnbmFsLnNpZ25hbChzaWdu YWwuU0lHVEVSTSwgY2xzLmhhbmRsZXIpCisgICAgICAgIGlmIGdldGF0dHIoc2lnbmFsLCAnU0lH SU5UJyk6CisgICAgICAgICAgICBzaWduYWwuc2lnbmFsKHNpZ25hbC5TSUdJTlQsIGNscy5oYW5k bGVyKQogCiAgICAgICAgIGxvZ2dlciA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCkKICAgICAgICAgZm9y IGhhbmRsZXIgaW4gbG9nZ2VyLmhhbmRsZXJzOgpAQCAtMjgwLDYgKzI5MSw3IEBAIGNsYXNzIF9Q cm9jZXNzKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgc3lzLnN0ZG91dC5mbHVzaCgpCiAgICAg ICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCiAgICAgICAgICAgICAgICAgcXVldWUuc2Vu ZChfU3RhdGUoX1N0YXRlLlNUT1BQSU5HKSkKKyAgICAgICAgICAgICAgICBjbHMucXVldWUuY2xv c2UoKQogICAgICAgICAgICAgICAgIGNscy5xdWV1ZSA9IE5vbmUKIAogCkBAIC0zMDksMjEgKzMy MSwxOCBAQCBjbGFzcyBUYXNrUG9vbChvYmplY3QpOgogICAgICAgICBuYW1lID0gbmFtZSBvciAn d29ya2VyJwogICAgICAgICBpZiBuYW1lID09IHNlbGYuUHJvY2Vzcy5uYW1lOgogICAgICAgICAg ICAgcmFpc2UgVmFsdWVFcnJvcigiUGFyZW50IHByb2Nlc3MgaXMgYWxyZWFkeSBuYW1lZCB7fSIu Zm9ybWF0KG5hbWUpKQorICAgICAgICBzZWxmLm5hbWUgPSBuYW1lCiAKICAgICAgICAgaWYgd29y a2VycyA8IDE6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdUYXNrUG9vbCByZXF1aXJl cyBwb3NpdGl2ZSBudW1iZXIgb2Ygd29ya2VycycpCiAKLSAgICAgICAgc2VsZi5xdWV1ZSA9IHNl bGYuQmlEaXJlY3Rpb25hbFF1ZXVlKCkKKyAgICAgICAgc2VsZi5xdWV1ZSA9IE5vbmUKKyAgICAg ICAgc2VsZi53b3JrZXJzID0gW10KKworICAgICAgICBzZWxmLl9zZXR1cF9hcmdzID0gKHNldHVw LCBzZXR1cGFyZ3MsIHNldHVwa3dhcmdzKQorICAgICAgICBzZWxmLl90ZWFyZG93bl9hcmdzID0g KHRlYXJkb3duLCB0ZWFyZG93bmFyZ3MsIHRlYXJkb3dua3dhcmdzKQorICAgICAgICBzZWxmLl9u dW1fd29ya2VycyA9IGludCh3b3JrZXJzKQogCi0gICAgICAgIHNlbGYud29ya2VycyA9IFttdWx0 aXByb2Nlc3NpbmcuUHJvY2VzcygKLSAgICAgICAgICAgIHRhcmdldD1zZWxmLlByb2Nlc3MubWFp biwKLSAgICAgICAgICAgIGFyZ3M9KAotICAgICAgICAgICAgICAgICd7fS97fScuZm9ybWF0KG5h bWUsIGNvdW50KSwgbG9nZ2luZy5nZXRMb2dnZXIoKS5nZXRFZmZlY3RpdmVMZXZlbCgpLAotICAg ICAgICAgICAgICAgIHNldHVwLCBzZXR1cGFyZ3MsIHNldHVwa3dhcmdzLAotICAgICAgICAgICAg ICAgIHNlbGYuQmlEaXJlY3Rpb25hbFF1ZXVlKG91dGdvaW5nPXNlbGYucXVldWUuaW5jb21pbmcs IGluY29taW5nPXNlbGYucXVldWUub3V0Z29pbmcpLAotICAgICAgICAgICAgICAgIHRlYXJkb3du LCB0ZWFyZG93bmFyZ3MsIHRlYXJkb3dua3dhcmdzLAotICAgICAgICAgICAgKSwKLSAgICAgICAg KSBmb3IgY291bnQgaW4gcmFuZ2Uod29ya2VycyldCiAgICAgICAgIHNlbGYuX3N0YXJ0ZWQgPSAw CiAKICAgICAgICAgc2VsZi5jYWxsYmFja3MgPSB7fQpAQCAtMzMyLDcgKzM0MSwxNyBAQCBjbGFz cyBUYXNrUG9vbChvYmplY3QpOgogICAgICAgICBzZWxmLmJsb2NrX3NpemUgPSBibG9ja19zaXpl CiAKICAgICBkZWYgX19lbnRlcl9fKHNlbGYpOgotICAgICAgICBmcm9tIG1vY2sgaW1wb3J0IHBh dGNoCisgICAgICAgIHNlbGYucXVldWUgPSBzZWxmLkJpRGlyZWN0aW9uYWxRdWV1ZSgpCisgICAg ICAgIHNlbGYud29ya2VycyA9IFttdWx0aXByb2Nlc3NpbmcuUHJvY2VzcygKKyAgICAgICAgICAg IHRhcmdldD1zZWxmLlByb2Nlc3MubWFpbiwKKyAgICAgICAgICAgIGFyZ3M9KAorICAgICAgICAg ICAgICAgICd7fS97fScuZm9ybWF0KHNlbGYubmFtZSwgY291bnQpLCBsb2dnaW5nLmdldExvZ2dl cigpLmdldEVmZmVjdGl2ZUxldmVsKCksCisgICAgICAgICAgICAgICAgc2VsZi5fc2V0dXBfYXJn c1swXSwgc2VsZi5fc2V0dXBfYXJnc1sxXSwgc2VsZi5fc2V0dXBfYXJnc1syXSwKKyAgICAgICAg ICAgICAgICBzZWxmLkJpRGlyZWN0aW9uYWxRdWV1ZShvdXRnb2luZz1zZWxmLnF1ZXVlLmluY29t aW5nLCBpbmNvbWluZz1zZWxmLnF1ZXVlLm91dGdvaW5nKSwKKyAgICAgICAgICAgICAgICBzZWxm Ll90ZWFyZG93bl9hcmdzWzBdLCBzZWxmLl90ZWFyZG93bl9hcmdzWzFdLCBzZWxmLl90ZWFyZG93 bl9hcmdzWzJdLAorICAgICAgICAgICAgKSwKKyAgICAgICAgKSBmb3IgY291bnQgaW4gcmFuZ2Uo c2VsZi5fbnVtX3dvcmtlcnMpXQorCiAKICAgICAgICAgd2l0aCBUaW1lb3V0KHNlY29uZHM9MTAs IHBhdGNoPUZhbHNlLCBoYW5kbGVyPXNlbGYuRXhjZXB0aW9uKCdGYWlsZWQgdG8gc3RhcnQgYWxs IHdvcmtlcnMnKSk6CiAgICAgICAgICAgICBmb3Igd29ya2VyIGluIHNlbGYud29ya2VyczoKQEAg LTM1Myw3ICszNzIsNyBAQCBjbGFzcyBUYXNrUG9vbChvYmplY3QpOgogICAgICAgICAgICAgd2hp bGUgVHJ1ZToKICAgICAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgICAgIHNlbGYu cXVldWUucmVjZWl2ZShibG9ja2luZz1GYWxzZSkoc2VsZikKLSAgICAgICAgICAgICAgICBleGNl cHQgRXhjZXB0aW9uOgorICAgICAgICAgICAgICAgIGV4Y2VwdCBRdWV1ZS5FbXB0eToKICAgICAg ICAgICAgICAgICAgICAgYnJlYWsKIAogICAgIGRlZiB3YWl0KHNlbGYpOgpAQCAtMzkzLDMgKzQx Miw3IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIG9zLmtp bGwod29ya2VyLnBpZCwgc2lnbmFsLlNJR0tJTEwpCiAgICAgICAgICAgICAgICAgZWxzZToKICAg ICAgICAgICAgICAgICAgICAgd29ya2VyLnRlcm1pbmF0ZSgpCisKKyAgICAgICAgICAgIHNlbGYu cXVldWUuY2xvc2UoKQorICAgICAgICAgICAgc2VsZi5xdWV1ZSA9IE5vbmUKKyAgICAgICAgICAg IHNlbGYud29ya2VycyA9IFtdCg== 429765 2021-05-26 09:36:11 -0700 2021-05-27 15:48:08 -0700 Patch bug-226238-20210526093610.patch text/plain 5442 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODA4NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIxLTA1LTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXldIEdyYWNlZnVsbHkgaGFuZGxlIENOVFJMLUMgaW4g VGFza1Bvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNjIzOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg0NzIxNDg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rhc2tfcG9vbC5weToKKyAgICAgICAgKF9CaURpcmVj dGlvbmFsUXVldWUuY2xvc2UpOiBUZWFyLWRvd24gcXVldWUgb2JqZWN0cyB3aGlsZSBzdXBwcmVz c2luZyBhbnkgbG9nZ2luZy4KKyAgICAgICAgKF9Qcm9jZXNzLmhhbmRsZXIpOiBCb3RoIFNJR1RF Uk0gYW5kIFNJR0lOVCBzaWduYWxzIHNob3VsZCBzdG9wIHdvcmtlciBwcm9jZXNzZXMuCisgICAg ICAgIChfUHJvY2Vzcy5tYWluKTogQWRkIFNJR0lOVCBoYW5kbGVyLCBleHBsaWNpdGx5IGNsb3Nl IHF1ZXVlLgorICAgICAgICAoVGFza1Bvb2wuX19pbml0X18pOiBEZWZlciB3b3JrZXIgYW5kIHF1 ZXVlIGNvbnN0cnVjdGlvbiB0byBjb250ZXh0IG1hbmFnZXIuCisgICAgICAgIChUYXNrUG9vbC5f X2VudGVyX18pOiBDb25zdHJ1Y3Qgd29ya2VyIHByb2Nlc3Nlcy4KKyAgICAgICAgKFRhc2tQb29s LmRvKTogT25seSBjYXRjaCBRdWV1ZS5FbXB0eSBleGNlcHRpb24uCisgICAgICAgIChUYXNrUG9v bC5fX2V4aXRfXyk6IEV4cGxpY2l0bHkgY2xvc2UgcXVldWUsIHJlc2V0IHdvcmtlcnMgYW5kIHF1 ZXVlLgorCiAyMDIxLTA1LTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4K IAogICAgICAgICBbdGVzdC1sbGRiLXdlYmtpdF0gVXBkYXRlIGZvciBYY29kZSAxMi41CkluZGV4 OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rhc2tf cG9vbC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3Jl cHkvd2Via2l0Y29yZXB5L3Rhc2tfcG9vbC5weQkocmV2aXNpb24gMjc4MDg1KQorKysgVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90YXNrX3Bvb2wucHkJ KHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDExIEBAIGltcG9ydCBtdWx0aXByb2Nlc3NpbmcK IGltcG9ydCBzaWduYWwKIGltcG9ydCBzeXMKIAoraWYgc3lzLnZlcnNpb25faW5mbyA8ICgzLCAw KToKKyAgICBpbXBvcnQgUXVldWUKK2Vsc2U6CisgICAgaW1wb3J0IHF1ZXVlIGFzIFF1ZXVlCisK IGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBPdXRwdXRDYXB0dXJlLCBUaW1lb3V0LCBsb2cKIAog CkBAIC0xNDYsNiArMTUxLDEzIEBAIGNsYXNzIF9CaURpcmVjdGlvbmFsUXVldWUob2JqZWN0KToK ICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5pbmNvbWluZy5nZXQodGltZW91dD1kaWZmZXJl bmNlKQogICAgICAgICAgICAgcmV0dXJuIHNlbGYuaW5jb21pbmcuZ2V0KCkKIAorICAgIGRlZiBj bG9zZShzZWxmKToKKyAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKCk6CisgICAgICAgICAgICBz ZWxmLm91dGdvaW5nLmNsb3NlKCkKKyAgICAgICAgICAgIHNlbGYuaW5jb21pbmcuY2xvc2UoKQor ICAgICAgICAgICAgc2VsZi5vdXRnb2luZy5qb2luX3RocmVhZCgpCisgICAgICAgICAgICBzZWxm LmluY29taW5nLmpvaW5fdGhyZWFkKCkKKwogCiBjbGFzcyBfUHJvY2VzcyhvYmplY3QpOgogICAg IG5hbWUgPSBOb25lCkBAIC0yMjgsNyArMjQwLDcgQEAgY2xhc3MgX1Byb2Nlc3Mob2JqZWN0KToK IAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBoYW5kbGVyKGNscywgdmFsdWUsIF8pOgotICAg ICAgICBpZiB2YWx1ZSA9PSBnZXRhdHRyKHNpZ25hbCwgJ1NJR1RFUk0nKToKKyAgICAgICAgaWYg dmFsdWUgaW4gKGdldGF0dHIoc2lnbmFsLCAnU0lHVEVSTScpLCBnZXRhdHRyKHNpZ25hbCwgJ1NJ R0lOVCcpKToKICAgICAgICAgICAgIGNscy53b3JraW5nID0gRmFsc2UKIAogICAgIEBjbGFzc21l dGhvZApAQCAtMjQ2LDYgKzI1OCw4IEBAIGNsYXNzIF9Qcm9jZXNzKG9iamVjdCk6CiAKICAgICAg ICAgaWYgZ2V0YXR0cihzaWduYWwsICdTSUdURVJNJyk6CiAgICAgICAgICAgICBzaWduYWwuc2ln bmFsKHNpZ25hbC5TSUdURVJNLCBjbHMuaGFuZGxlcikKKyAgICAgICAgaWYgZ2V0YXR0cihzaWdu YWwsICdTSUdJTlQnKToKKyAgICAgICAgICAgIHNpZ25hbC5zaWduYWwoc2lnbmFsLlNJR0lOVCwg Y2xzLmhhbmRsZXIpCiAKICAgICAgICAgbG9nZ2VyID0gbG9nZ2luZy5nZXRMb2dnZXIoKQogICAg ICAgICBmb3IgaGFuZGxlciBpbiBsb2dnZXIuaGFuZGxlcnM6CkBAIC0yODAsNiArMjk0LDcgQEAg Y2xhc3MgX1Byb2Nlc3Mob2JqZWN0KToKICAgICAgICAgICAgICAgICBzeXMuc3Rkb3V0LmZsdXNo KCkKICAgICAgICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKICAgICAgICAgICAgICAgICBx dWV1ZS5zZW5kKF9TdGF0ZShfU3RhdGUuU1RPUFBJTkcpKQorICAgICAgICAgICAgICAgIGNscy5x dWV1ZS5jbG9zZSgpCiAgICAgICAgICAgICAgICAgY2xzLnF1ZXVlID0gTm9uZQogCiAKQEAgLTMw OSwyMSArMzI0LDE4IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAgICAgIG5hbWUgPSBu YW1lIG9yICd3b3JrZXInCiAgICAgICAgIGlmIG5hbWUgPT0gc2VsZi5Qcm9jZXNzLm5hbWU6CiAg ICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJQYXJlbnQgcHJvY2VzcyBpcyBhbHJlYWR5IG5h bWVkIHt9Ii5mb3JtYXQobmFtZSkpCisgICAgICAgIHNlbGYubmFtZSA9IG5hbWUKIAogICAgICAg ICBpZiB3b3JrZXJzIDwgMToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ1Rhc2tQb29s IHJlcXVpcmVzIHBvc2l0aXZlIG51bWJlciBvZiB3b3JrZXJzJykKIAotICAgICAgICBzZWxmLnF1 ZXVlID0gc2VsZi5CaURpcmVjdGlvbmFsUXVldWUoKQorICAgICAgICBzZWxmLnF1ZXVlID0gTm9u ZQorICAgICAgICBzZWxmLndvcmtlcnMgPSBbXQorCisgICAgICAgIHNlbGYuX3NldHVwX2FyZ3Mg PSAoc2V0dXAsIHNldHVwYXJncywgc2V0dXBrd2FyZ3MpCisgICAgICAgIHNlbGYuX3RlYXJkb3du X2FyZ3MgPSAodGVhcmRvd24sIHRlYXJkb3duYXJncywgdGVhcmRvd25rd2FyZ3MpCisgICAgICAg IHNlbGYuX251bV93b3JrZXJzID0gaW50KHdvcmtlcnMpCiAKLSAgICAgICAgc2VsZi53b3JrZXJz ID0gW211bHRpcHJvY2Vzc2luZy5Qcm9jZXNzKAotICAgICAgICAgICAgdGFyZ2V0PXNlbGYuUHJv Y2Vzcy5tYWluLAotICAgICAgICAgICAgYXJncz0oCi0gICAgICAgICAgICAgICAgJ3t9L3t9Jy5m b3JtYXQobmFtZSwgY291bnQpLCBsb2dnaW5nLmdldExvZ2dlcigpLmdldEVmZmVjdGl2ZUxldmVs KCksCi0gICAgICAgICAgICAgICAgc2V0dXAsIHNldHVwYXJncywgc2V0dXBrd2FyZ3MsCi0gICAg ICAgICAgICAgICAgc2VsZi5CaURpcmVjdGlvbmFsUXVldWUob3V0Z29pbmc9c2VsZi5xdWV1ZS5p bmNvbWluZywgaW5jb21pbmc9c2VsZi5xdWV1ZS5vdXRnb2luZyksCi0gICAgICAgICAgICAgICAg dGVhcmRvd24sIHRlYXJkb3duYXJncywgdGVhcmRvd25rd2FyZ3MsCi0gICAgICAgICAgICApLAot ICAgICAgICApIGZvciBjb3VudCBpbiByYW5nZSh3b3JrZXJzKV0KICAgICAgICAgc2VsZi5fc3Rh cnRlZCA9IDAKIAogICAgICAgICBzZWxmLmNhbGxiYWNrcyA9IHt9CkBAIC0zMzIsNyArMzQ0LDE3 IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAgICAgIHNlbGYuYmxvY2tfc2l6ZSA9IGJs b2NrX3NpemUKIAogICAgIGRlZiBfX2VudGVyX18oc2VsZik6Ci0gICAgICAgIGZyb20gbW9jayBp bXBvcnQgcGF0Y2gKKyAgICAgICAgc2VsZi5xdWV1ZSA9IHNlbGYuQmlEaXJlY3Rpb25hbFF1ZXVl KCkKKyAgICAgICAgc2VsZi53b3JrZXJzID0gW211bHRpcHJvY2Vzc2luZy5Qcm9jZXNzKAorICAg ICAgICAgICAgdGFyZ2V0PXNlbGYuUHJvY2Vzcy5tYWluLAorICAgICAgICAgICAgYXJncz0oCisg ICAgICAgICAgICAgICAgJ3t9L3t9Jy5mb3JtYXQoc2VsZi5uYW1lLCBjb3VudCksIGxvZ2dpbmcu Z2V0TG9nZ2VyKCkuZ2V0RWZmZWN0aXZlTGV2ZWwoKSwKKyAgICAgICAgICAgICAgICBzZWxmLl9z ZXR1cF9hcmdzWzBdLCBzZWxmLl9zZXR1cF9hcmdzWzFdLCBzZWxmLl9zZXR1cF9hcmdzWzJdLAor ICAgICAgICAgICAgICAgIHNlbGYuQmlEaXJlY3Rpb25hbFF1ZXVlKG91dGdvaW5nPXNlbGYucXVl dWUuaW5jb21pbmcsIGluY29taW5nPXNlbGYucXVldWUub3V0Z29pbmcpLAorICAgICAgICAgICAg ICAgIHNlbGYuX3RlYXJkb3duX2FyZ3NbMF0sIHNlbGYuX3RlYXJkb3duX2FyZ3NbMV0sIHNlbGYu X3RlYXJkb3duX2FyZ3NbMl0sCisgICAgICAgICAgICApLAorICAgICAgICApIGZvciBjb3VudCBp biByYW5nZShzZWxmLl9udW1fd29ya2VycyldCisKIAogICAgICAgICB3aXRoIFRpbWVvdXQoc2Vj b25kcz0xMCwgcGF0Y2g9RmFsc2UsIGhhbmRsZXI9c2VsZi5FeGNlcHRpb24oJ0ZhaWxlZCB0byBz dGFydCBhbGwgd29ya2VycycpKToKICAgICAgICAgICAgIGZvciB3b3JrZXIgaW4gc2VsZi53b3Jr ZXJzOgpAQCAtMzUzLDcgKzM3NSw3IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAgICAg ICAgICB3aGlsZSBUcnVlOgogICAgICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICAg ICAgc2VsZi5xdWV1ZS5yZWNlaXZlKGJsb2NraW5nPUZhbHNlKShzZWxmKQotICAgICAgICAgICAg ICAgIGV4Y2VwdCBFeGNlcHRpb246CisgICAgICAgICAgICAgICAgZXhjZXB0IFF1ZXVlLkVtcHR5 OgogICAgICAgICAgICAgICAgICAgICBicmVhawogCiAgICAgZGVmIHdhaXQoc2VsZik6CkBAIC0z OTMsMyArNDE1LDcgQEAgY2xhc3MgVGFza1Bvb2wob2JqZWN0KToKICAgICAgICAgICAgICAgICAg ICAgb3Mua2lsbCh3b3JrZXIucGlkLCBzaWduYWwuU0lHS0lMTCkKICAgICAgICAgICAgICAgICBl bHNlOgogICAgICAgICAgICAgICAgICAgICB3b3JrZXIudGVybWluYXRlKCkKKworICAgICAgICAg ICAgc2VsZi5xdWV1ZS5jbG9zZSgpCisgICAgICAgICAgICBzZWxmLnF1ZXVlID0gTm9uZQorICAg ICAgICAgICAgc2VsZi53b3JrZXJzID0gW10K 429945 2021-05-27 15:48:12 -0700 2021-05-27 18:03:23 -0700 Patch bug-226238-20210527154811.patch text/plain 5455 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODE3OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIxLTA1LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXldIEdyYWNlZnVsbHkgaGFuZGxlIENOVFJMLUMgaW4g VGFza1Bvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNjIzOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg0NzIxNDg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rhc2tfcG9vbC5weToKKyAgICAgICAgKF9CaURpcmVj dGlvbmFsUXVldWUuY2xvc2UpOiBUZWFyLWRvd24gcXVldWUgb2JqZWN0cyB3aGlsZSBzdXBwcmVz c2luZyBhbnkgbG9nZ2luZy4KKyAgICAgICAgKF9Qcm9jZXNzLmhhbmRsZXIpOiBCb3RoIFNJR1RF Uk0gYW5kIFNJR0lOVCBzaWduYWxzIHNob3VsZCBzdG9wIHdvcmtlciBwcm9jZXNzZXMuCisgICAg ICAgIChfUHJvY2Vzcy5tYWluKTogQWRkIFNJR0lOVCBoYW5kbGVyLCBleHBsaWNpdGx5IGNsb3Nl IHF1ZXVlLgorICAgICAgICAoVGFza1Bvb2wuX19pbml0X18pOiBEZWZlciB3b3JrZXIgYW5kIHF1 ZXVlIGNvbnN0cnVjdGlvbiB0byBjb250ZXh0IG1hbmFnZXIuCisgICAgICAgIChUYXNrUG9vbC5f X2VudGVyX18pOiBDb25zdHJ1Y3Qgd29ya2VyIHByb2Nlc3Nlcy4KKyAgICAgICAgKFRhc2tQb29s LmRvKTogT25seSBjYXRjaCBRdWV1ZS5FbXB0eSBleGNlcHRpb24uCisgICAgICAgIChUYXNrUG9v bC5fX2V4aXRfXyk6IEV4cGxpY2l0bHkgY2xvc2UgcXVldWUsIHJlc2V0IHdvcmtlcnMgYW5kIHF1 ZXVlLgorCiAyMDIxLTA1LTI3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnku Y29tPgogCiAgICAgICAgIFtydW4td2Via2l0LXRlc3RzXVtXaW5dIFN0cmlwIFBIUCBzdXBwb3J0 IGZyb20gd2Vic2VydmVyCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3Jl cHkvd2Via2l0Y29yZXB5L3Rhc2tfcG9vbC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rhc2tfcG9vbC5weQkocmV2aXNp b24gMjc4MTc5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS90YXNrX3Bvb2wucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDExIEBAIGlt cG9ydCBtdWx0aXByb2Nlc3NpbmcKIGltcG9ydCBzaWduYWwKIGltcG9ydCBzeXMKIAoraWYgc3lz LnZlcnNpb25faW5mbyA8ICgzLCAwKToKKyAgICBpbXBvcnQgUXVldWUKK2Vsc2U6CisgICAgaW1w b3J0IHF1ZXVlIGFzIFF1ZXVlCisKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBPdXRwdXRDYXB0 dXJlLCBUaW1lb3V0LCBsb2cKIAogCkBAIC0xNDYsNiArMTUxLDEzIEBAIGNsYXNzIF9CaURpcmVj dGlvbmFsUXVldWUob2JqZWN0KToKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5pbmNvbWlu Zy5nZXQodGltZW91dD1kaWZmZXJlbmNlKQogICAgICAgICAgICAgcmV0dXJuIHNlbGYuaW5jb21p bmcuZ2V0KCkKIAorICAgIGRlZiBjbG9zZShzZWxmKToKKyAgICAgICAgd2l0aCBPdXRwdXRDYXB0 dXJlKCk6CisgICAgICAgICAgICBzZWxmLm91dGdvaW5nLmNsb3NlKCkKKyAgICAgICAgICAgIHNl bGYuaW5jb21pbmcuY2xvc2UoKQorICAgICAgICAgICAgc2VsZi5vdXRnb2luZy5qb2luX3RocmVh ZCgpCisgICAgICAgICAgICBzZWxmLmluY29taW5nLmpvaW5fdGhyZWFkKCkKKwogCiBjbGFzcyBf UHJvY2VzcyhvYmplY3QpOgogICAgIG5hbWUgPSBOb25lCkBAIC0yMjgsNyArMjQwLDcgQEAgY2xh c3MgX1Byb2Nlc3Mob2JqZWN0KToKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBoYW5kbGVy KGNscywgdmFsdWUsIF8pOgotICAgICAgICBpZiB2YWx1ZSA9PSBnZXRhdHRyKHNpZ25hbCwgJ1NJ R1RFUk0nKToKKyAgICAgICAgaWYgdmFsdWUgaW4gKGdldGF0dHIoc2lnbmFsLCAnU0lHVEVSTScp LCBnZXRhdHRyKHNpZ25hbCwgJ1NJR0lOVCcpKToKICAgICAgICAgICAgIGNscy53b3JraW5nID0g RmFsc2UKIAogICAgIEBjbGFzc21ldGhvZApAQCAtMjQ2LDYgKzI1OCw4IEBAIGNsYXNzIF9Qcm9j ZXNzKG9iamVjdCk6CiAKICAgICAgICAgaWYgZ2V0YXR0cihzaWduYWwsICdTSUdURVJNJyk6CiAg ICAgICAgICAgICBzaWduYWwuc2lnbmFsKHNpZ25hbC5TSUdURVJNLCBjbHMuaGFuZGxlcikKKyAg ICAgICAgaWYgZ2V0YXR0cihzaWduYWwsICdTSUdJTlQnKToKKyAgICAgICAgICAgIHNpZ25hbC5z aWduYWwoc2lnbmFsLlNJR0lOVCwgY2xzLmhhbmRsZXIpCiAKICAgICAgICAgbG9nZ2VyID0gbG9n Z2luZy5nZXRMb2dnZXIoKQogICAgICAgICBmb3IgaGFuZGxlciBpbiBsb2dnZXIuaGFuZGxlcnM6 CkBAIC0yODAsNiArMjk0LDcgQEAgY2xhc3MgX1Byb2Nlc3Mob2JqZWN0KToKICAgICAgICAgICAg ICAgICBzeXMuc3Rkb3V0LmZsdXNoKCkKICAgICAgICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNo KCkKICAgICAgICAgICAgICAgICBxdWV1ZS5zZW5kKF9TdGF0ZShfU3RhdGUuU1RPUFBJTkcpKQor ICAgICAgICAgICAgICAgIGNscy5xdWV1ZS5jbG9zZSgpCiAgICAgICAgICAgICAgICAgY2xzLnF1 ZXVlID0gTm9uZQogCiAKQEAgLTMwOSwyMSArMzI0LDE4IEBAIGNsYXNzIFRhc2tQb29sKG9iamVj dCk6CiAgICAgICAgIG5hbWUgPSBuYW1lIG9yICd3b3JrZXInCiAgICAgICAgIGlmIG5hbWUgPT0g c2VsZi5Qcm9jZXNzLm5hbWU6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJQYXJlbnQg cHJvY2VzcyBpcyBhbHJlYWR5IG5hbWVkIHt9Ii5mb3JtYXQobmFtZSkpCisgICAgICAgIHNlbGYu bmFtZSA9IG5hbWUKIAogICAgICAgICBpZiB3b3JrZXJzIDwgMToKICAgICAgICAgICAgIHJhaXNl IFZhbHVlRXJyb3IoJ1Rhc2tQb29sIHJlcXVpcmVzIHBvc2l0aXZlIG51bWJlciBvZiB3b3JrZXJz JykKIAotICAgICAgICBzZWxmLnF1ZXVlID0gc2VsZi5CaURpcmVjdGlvbmFsUXVldWUoKQorICAg ICAgICBzZWxmLnF1ZXVlID0gTm9uZQorICAgICAgICBzZWxmLndvcmtlcnMgPSBbXQorCisgICAg ICAgIHNlbGYuX3NldHVwX2FyZ3MgPSAoc2V0dXAsIHNldHVwYXJncywgc2V0dXBrd2FyZ3MpCisg ICAgICAgIHNlbGYuX3RlYXJkb3duX2FyZ3MgPSAodGVhcmRvd24sIHRlYXJkb3duYXJncywgdGVh cmRvd25rd2FyZ3MpCisgICAgICAgIHNlbGYuX251bV93b3JrZXJzID0gaW50KHdvcmtlcnMpCiAK LSAgICAgICAgc2VsZi53b3JrZXJzID0gW211bHRpcHJvY2Vzc2luZy5Qcm9jZXNzKAotICAgICAg ICAgICAgdGFyZ2V0PXNlbGYuUHJvY2Vzcy5tYWluLAotICAgICAgICAgICAgYXJncz0oCi0gICAg ICAgICAgICAgICAgJ3t9L3t9Jy5mb3JtYXQobmFtZSwgY291bnQpLCBsb2dnaW5nLmdldExvZ2dl cigpLmdldEVmZmVjdGl2ZUxldmVsKCksCi0gICAgICAgICAgICAgICAgc2V0dXAsIHNldHVwYXJn cywgc2V0dXBrd2FyZ3MsCi0gICAgICAgICAgICAgICAgc2VsZi5CaURpcmVjdGlvbmFsUXVldWUo b3V0Z29pbmc9c2VsZi5xdWV1ZS5pbmNvbWluZywgaW5jb21pbmc9c2VsZi5xdWV1ZS5vdXRnb2lu ZyksCi0gICAgICAgICAgICAgICAgdGVhcmRvd24sIHRlYXJkb3duYXJncywgdGVhcmRvd25rd2Fy Z3MsCi0gICAgICAgICAgICApLAotICAgICAgICApIGZvciBjb3VudCBpbiByYW5nZSh3b3JrZXJz KV0KICAgICAgICAgc2VsZi5fc3RhcnRlZCA9IDAKIAogICAgICAgICBzZWxmLmNhbGxiYWNrcyA9 IHt9CkBAIC0zMzQsNiArMzQ2LDE3IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAgZGVm IF9fZW50ZXJfXyhzZWxmKToKICAgICAgICAgZnJvbSBtb2NrIGltcG9ydCBwYXRjaAogCisgICAg ICAgIHNlbGYucXVldWUgPSBzZWxmLkJpRGlyZWN0aW9uYWxRdWV1ZSgpCisgICAgICAgIHNlbGYu d29ya2VycyA9IFttdWx0aXByb2Nlc3NpbmcuUHJvY2VzcygKKyAgICAgICAgICAgIHRhcmdldD1z ZWxmLlByb2Nlc3MubWFpbiwKKyAgICAgICAgICAgIGFyZ3M9KAorICAgICAgICAgICAgICAgICd7 fS97fScuZm9ybWF0KHNlbGYubmFtZSwgY291bnQpLCBsb2dnaW5nLmdldExvZ2dlcigpLmdldEVm ZmVjdGl2ZUxldmVsKCksCisgICAgICAgICAgICAgICAgc2VsZi5fc2V0dXBfYXJnc1swXSwgc2Vs Zi5fc2V0dXBfYXJnc1sxXSwgc2VsZi5fc2V0dXBfYXJnc1syXSwKKyAgICAgICAgICAgICAgICBz ZWxmLkJpRGlyZWN0aW9uYWxRdWV1ZShvdXRnb2luZz1zZWxmLnF1ZXVlLmluY29taW5nLCBpbmNv bWluZz1zZWxmLnF1ZXVlLm91dGdvaW5nKSwKKyAgICAgICAgICAgICAgICBzZWxmLl90ZWFyZG93 bl9hcmdzWzBdLCBzZWxmLl90ZWFyZG93bl9hcmdzWzFdLCBzZWxmLl90ZWFyZG93bl9hcmdzWzJd LAorICAgICAgICAgICAgKSwKKyAgICAgICAgKSBmb3IgY291bnQgaW4gcmFuZ2Uoc2VsZi5fbnVt X3dvcmtlcnMpXQorCiAgICAgICAgIHdpdGggVGltZW91dChzZWNvbmRzPTEwLCBwYXRjaD1GYWxz ZSwgaGFuZGxlcj1zZWxmLkV4Y2VwdGlvbignRmFpbGVkIHRvIHN0YXJ0IGFsbCB3b3JrZXJzJykp OgogICAgICAgICAgICAgZm9yIHdvcmtlciBpbiBzZWxmLndvcmtlcnM6CiAgICAgICAgICAgICAg ICAgd29ya2VyLnN0YXJ0KCkKQEAgLTM1Myw3ICszNzYsNyBAQCBjbGFzcyBUYXNrUG9vbChvYmpl Y3QpOgogICAgICAgICAgICAgd2hpbGUgVHJ1ZToKICAgICAgICAgICAgICAgICB0cnk6CiAgICAg ICAgICAgICAgICAgICAgIHNlbGYucXVldWUucmVjZWl2ZShibG9ja2luZz1GYWxzZSkoc2VsZikK LSAgICAgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uOgorICAgICAgICAgICAgICAgIGV4Y2Vw dCBRdWV1ZS5FbXB0eToKICAgICAgICAgICAgICAgICAgICAgYnJlYWsKIAogICAgIGRlZiB3YWl0 KHNlbGYpOgpAQCAtMzkzLDMgKzQxNiw3IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAg ICAgICAgICAgICAgICAgIG9zLmtpbGwod29ya2VyLnBpZCwgc2lnbmFsLlNJR0tJTEwpCiAgICAg ICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICAgICAgd29ya2VyLnRlcm1pbmF0ZSgp CisKKyAgICAgICAgICAgIHNlbGYucXVldWUuY2xvc2UoKQorICAgICAgICAgICAgc2VsZi5xdWV1 ZSA9IE5vbmUKKyAgICAgICAgICAgIHNlbGYud29ya2VycyA9IFtdCg== 429969 2021-05-27 18:03:27 -0700 2021-05-27 19:27:07 -0700 Patch for landing bug-226238-20210527180324.patch text/plain 6811 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODE4MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIxLTA1LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXldIEdyYWNlZnVsbHkgaGFuZGxlIENOVFJMLUMgaW4g VGFza1Bvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNjIzOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg0NzIxNDg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgRGV3ZWkgWmh1LgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAg ICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90YXNrX3Bvb2wu cHk6CisgICAgICAgIChfQmlEaXJlY3Rpb25hbFF1ZXVlLmNsb3NlKTogVGVhci1kb3duIHF1ZXVl IG9iamVjdHMgd2hpbGUgc3VwcHJlc3NpbmcgYW55IGxvZ2dpbmcuCisgICAgICAgIChfUHJvY2Vz cy5oYW5kbGVyKTogQm90aCBTSUdURVJNIGFuZCBTSUdJTlQgc2lnbmFscyBzaG91bGQgc3RvcCB3 b3JrZXIgcHJvY2Vzc2VzLgorICAgICAgICAoX1Byb2Nlc3MubWFpbik6IEFkZCBTSUdJTlQgaGFu ZGxlciwgZXhwbGljaXRseSBjbG9zZSBxdWV1ZS4KKyAgICAgICAgKFRhc2tQb29sLl9faW5pdF9f KTogRGVmZXIgd29ya2VyIGFuZCBxdWV1ZSBjb25zdHJ1Y3Rpb24gdG8gY29udGV4dCBtYW5hZ2Vy IHNvIHRoYXQgd2UKKyAgICAgICAgZG8gbm90IGhhdmUgYW4gaW5zdGFudGlhdGVkIGJ1dCBpbnZh bGlkIHF1ZXVlIGlmIHBpcGVzIGFyZSBicm9rZW4gYnkgY2hpbGRyZW4gcHJvY2Vzc2VzLgorICAg ICAgICAoVGFza1Bvb2wuX19lbnRlcl9fKTogQ29uc3RydWN0IHdvcmtlciBwcm9jZXNzZXMuCisg ICAgICAgIChUYXNrUG9vbC5kbyk6IE9ubHkgY2F0Y2ggUXVldWUuRW1wdHkgZXhjZXB0aW9uLgor ICAgICAgICAoVGFza1Bvb2wuX19leGl0X18pOiBFeHBsaWNpdGx5IGNsb3NlIHF1ZXVlLCByZXNl dCB3b3JrZXJzIGFuZCBxdWV1ZS4KKwogMjAyMS0wNS0yNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJv bm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c11bV2luXSBT dHJpcCBQSFAgc3VwcG9ydCBmcm9tIHdlYnNlcnZlcgpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQkocmV2aXNpb24gMjc4MTgzKQorKysgVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkp CkBAIC0zMCw3ICszMCw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Vi a2l0Y29yZXB5JywKLSAgICB2ZXJzaW9uPScwLjUuMTQnLAorICAgIHZlcnNpb249JzAuNS4xNScs CiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgY29udGFpbmluZyB2YXJpb3VzIFB5dGhvbiBzdXBw b3J0IGNsYXNzZXMgYW5kIGZ1bmN0aW9ucy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1l KCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CShy ZXZpc2lvbiAyNzgxODMpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkv d2Via2l0Y29yZXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw3IEBA IGZyb20gd2Via2l0Y29yZXB5Lm91dHB1dF9jYXB0dXJlIGltcG9ydCAKIGZyb20gd2Via2l0Y29y ZXB5LnRhc2tfcG9vbCBpbXBvcnQgVGFza1Bvb2wKIGZyb20gd2Via2l0Y29yZXB5LmNyZWRlbnRp YWxzIGltcG9ydCBjcmVkZW50aWFscwogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA1LCAxNCkKK3Zl cnNpb24gPSBWZXJzaW9uKDAsIDUsIDE1KQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFs bCBpbXBvcnQgUGFja2FnZSwgQXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywg MCk6CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L3Rhc2tfcG9vbC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rhc2tfcG9vbC5weQkocmV2aXNpb24gMjc4MTgzKQor KysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90YXNr X3Bvb2wucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDExIEBAIGltcG9ydCBtdWx0aXBy b2Nlc3NpbmcKIGltcG9ydCBzaWduYWwKIGltcG9ydCBzeXMKIAoraWYgc3lzLnZlcnNpb25faW5m byA8ICgzLCAwKToKKyAgICBpbXBvcnQgUXVldWUKK2Vsc2U6CisgICAgaW1wb3J0IHF1ZXVlIGFz IFF1ZXVlCisKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBPdXRwdXRDYXB0dXJlLCBUaW1lb3V0 LCBsb2cKIAogCkBAIC0xNDYsNiArMTUxLDEzIEBAIGNsYXNzIF9CaURpcmVjdGlvbmFsUXVldWUo b2JqZWN0KToKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5pbmNvbWluZy5nZXQodGltZW91 dD1kaWZmZXJlbmNlKQogICAgICAgICAgICAgcmV0dXJuIHNlbGYuaW5jb21pbmcuZ2V0KCkKIAor ICAgIGRlZiBjbG9zZShzZWxmKToKKyAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKCk6CisgICAg ICAgICAgICBzZWxmLm91dGdvaW5nLmNsb3NlKCkKKyAgICAgICAgICAgIHNlbGYuaW5jb21pbmcu Y2xvc2UoKQorICAgICAgICAgICAgc2VsZi5vdXRnb2luZy5qb2luX3RocmVhZCgpCisgICAgICAg ICAgICBzZWxmLmluY29taW5nLmpvaW5fdGhyZWFkKCkKKwogCiBjbGFzcyBfUHJvY2VzcyhvYmpl Y3QpOgogICAgIG5hbWUgPSBOb25lCkBAIC0yMjgsNyArMjQwLDcgQEAgY2xhc3MgX1Byb2Nlc3Mo b2JqZWN0KToKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBoYW5kbGVyKGNscywgdmFsdWUs IF8pOgotICAgICAgICBpZiB2YWx1ZSA9PSBnZXRhdHRyKHNpZ25hbCwgJ1NJR1RFUk0nKToKKyAg ICAgICAgaWYgdmFsdWUgaW4gKGdldGF0dHIoc2lnbmFsLCAnU0lHVEVSTScpLCBnZXRhdHRyKHNp Z25hbCwgJ1NJR0lOVCcpKToKICAgICAgICAgICAgIGNscy53b3JraW5nID0gRmFsc2UKIAogICAg IEBjbGFzc21ldGhvZApAQCAtMjQ2LDYgKzI1OCw4IEBAIGNsYXNzIF9Qcm9jZXNzKG9iamVjdCk6 CiAKICAgICAgICAgaWYgZ2V0YXR0cihzaWduYWwsICdTSUdURVJNJyk6CiAgICAgICAgICAgICBz aWduYWwuc2lnbmFsKHNpZ25hbC5TSUdURVJNLCBjbHMuaGFuZGxlcikKKyAgICAgICAgaWYgZ2V0 YXR0cihzaWduYWwsICdTSUdJTlQnKToKKyAgICAgICAgICAgIHNpZ25hbC5zaWduYWwoc2lnbmFs LlNJR0lOVCwgY2xzLmhhbmRsZXIpCiAKICAgICAgICAgbG9nZ2VyID0gbG9nZ2luZy5nZXRMb2dn ZXIoKQogICAgICAgICBmb3IgaGFuZGxlciBpbiBsb2dnZXIuaGFuZGxlcnM6CkBAIC0yODAsNiAr Mjk0LDcgQEAgY2xhc3MgX1Byb2Nlc3Mob2JqZWN0KToKICAgICAgICAgICAgICAgICBzeXMuc3Rk b3V0LmZsdXNoKCkKICAgICAgICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKICAgICAgICAg ICAgICAgICBxdWV1ZS5zZW5kKF9TdGF0ZShfU3RhdGUuU1RPUFBJTkcpKQorICAgICAgICAgICAg ICAgIGNscy5xdWV1ZS5jbG9zZSgpCiAgICAgICAgICAgICAgICAgY2xzLnF1ZXVlID0gTm9uZQog CiAKQEAgLTMwOSwyMSArMzI0LDE4IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAgICAg IG5hbWUgPSBuYW1lIG9yICd3b3JrZXInCiAgICAgICAgIGlmIG5hbWUgPT0gc2VsZi5Qcm9jZXNz Lm5hbWU6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJQYXJlbnQgcHJvY2VzcyBpcyBh bHJlYWR5IG5hbWVkIHt9Ii5mb3JtYXQobmFtZSkpCisgICAgICAgIHNlbGYubmFtZSA9IG5hbWUK IAogICAgICAgICBpZiB3b3JrZXJzIDwgMToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3Io J1Rhc2tQb29sIHJlcXVpcmVzIHBvc2l0aXZlIG51bWJlciBvZiB3b3JrZXJzJykKIAotICAgICAg ICBzZWxmLnF1ZXVlID0gc2VsZi5CaURpcmVjdGlvbmFsUXVldWUoKQorICAgICAgICBzZWxmLnF1 ZXVlID0gTm9uZQorICAgICAgICBzZWxmLndvcmtlcnMgPSBbXQorCisgICAgICAgIHNlbGYuX3Nl dHVwX2FyZ3MgPSAoc2V0dXAsIHNldHVwYXJncywgc2V0dXBrd2FyZ3MpCisgICAgICAgIHNlbGYu X3RlYXJkb3duX2FyZ3MgPSAodGVhcmRvd24sIHRlYXJkb3duYXJncywgdGVhcmRvd25rd2FyZ3Mp CisgICAgICAgIHNlbGYuX251bV93b3JrZXJzID0gaW50KHdvcmtlcnMpCiAKLSAgICAgICAgc2Vs Zi53b3JrZXJzID0gW211bHRpcHJvY2Vzc2luZy5Qcm9jZXNzKAotICAgICAgICAgICAgdGFyZ2V0 PXNlbGYuUHJvY2Vzcy5tYWluLAotICAgICAgICAgICAgYXJncz0oCi0gICAgICAgICAgICAgICAg J3t9L3t9Jy5mb3JtYXQobmFtZSwgY291bnQpLCBsb2dnaW5nLmdldExvZ2dlcigpLmdldEVmZmVj dGl2ZUxldmVsKCksCi0gICAgICAgICAgICAgICAgc2V0dXAsIHNldHVwYXJncywgc2V0dXBrd2Fy Z3MsCi0gICAgICAgICAgICAgICAgc2VsZi5CaURpcmVjdGlvbmFsUXVldWUob3V0Z29pbmc9c2Vs Zi5xdWV1ZS5pbmNvbWluZywgaW5jb21pbmc9c2VsZi5xdWV1ZS5vdXRnb2luZyksCi0gICAgICAg ICAgICAgICAgdGVhcmRvd24sIHRlYXJkb3duYXJncywgdGVhcmRvd25rd2FyZ3MsCi0gICAgICAg ICAgICApLAotICAgICAgICApIGZvciBjb3VudCBpbiByYW5nZSh3b3JrZXJzKV0KICAgICAgICAg c2VsZi5fc3RhcnRlZCA9IDAKIAogICAgICAgICBzZWxmLmNhbGxiYWNrcyA9IHt9CkBAIC0zMzQs NiArMzQ2LDE3IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAgZGVmIF9fZW50ZXJfXyhz ZWxmKToKICAgICAgICAgZnJvbSBtb2NrIGltcG9ydCBwYXRjaAogCisgICAgICAgIHNlbGYucXVl dWUgPSBzZWxmLkJpRGlyZWN0aW9uYWxRdWV1ZSgpCisgICAgICAgIHNlbGYud29ya2VycyA9IFtt dWx0aXByb2Nlc3NpbmcuUHJvY2VzcygKKyAgICAgICAgICAgIHRhcmdldD1zZWxmLlByb2Nlc3Mu bWFpbiwKKyAgICAgICAgICAgIGFyZ3M9KAorICAgICAgICAgICAgICAgICd7fS97fScuZm9ybWF0 KHNlbGYubmFtZSwgY291bnQpLCBsb2dnaW5nLmdldExvZ2dlcigpLmdldEVmZmVjdGl2ZUxldmVs KCksCisgICAgICAgICAgICAgICAgc2VsZi5fc2V0dXBfYXJnc1swXSwgc2VsZi5fc2V0dXBfYXJn c1sxXSwgc2VsZi5fc2V0dXBfYXJnc1syXSwKKyAgICAgICAgICAgICAgICBzZWxmLkJpRGlyZWN0 aW9uYWxRdWV1ZShvdXRnb2luZz1zZWxmLnF1ZXVlLmluY29taW5nLCBpbmNvbWluZz1zZWxmLnF1 ZXVlLm91dGdvaW5nKSwKKyAgICAgICAgICAgICAgICBzZWxmLl90ZWFyZG93bl9hcmdzWzBdLCBz ZWxmLl90ZWFyZG93bl9hcmdzWzFdLCBzZWxmLl90ZWFyZG93bl9hcmdzWzJdLAorICAgICAgICAg ICAgKSwKKyAgICAgICAgKSBmb3IgY291bnQgaW4gcmFuZ2Uoc2VsZi5fbnVtX3dvcmtlcnMpXQor CiAgICAgICAgIHdpdGggVGltZW91dChzZWNvbmRzPTEwLCBwYXRjaD1GYWxzZSwgaGFuZGxlcj1z ZWxmLkV4Y2VwdGlvbignRmFpbGVkIHRvIHN0YXJ0IGFsbCB3b3JrZXJzJykpOgogICAgICAgICAg ICAgZm9yIHdvcmtlciBpbiBzZWxmLndvcmtlcnM6CiAgICAgICAgICAgICAgICAgd29ya2VyLnN0 YXJ0KCkKQEAgLTM1Myw3ICszNzYsNyBAQCBjbGFzcyBUYXNrUG9vbChvYmplY3QpOgogICAgICAg ICAgICAgd2hpbGUgVHJ1ZToKICAgICAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAg ICAgIHNlbGYucXVldWUucmVjZWl2ZShibG9ja2luZz1GYWxzZSkoc2VsZikKLSAgICAgICAgICAg ICAgICBleGNlcHQgRXhjZXB0aW9uOgorICAgICAgICAgICAgICAgIGV4Y2VwdCBRdWV1ZS5FbXB0 eToKICAgICAgICAgICAgICAgICAgICAgYnJlYWsKIAogICAgIGRlZiB3YWl0KHNlbGYpOgpAQCAt MzkzLDMgKzQxNiw3IEBAIGNsYXNzIFRhc2tQb29sKG9iamVjdCk6CiAgICAgICAgICAgICAgICAg ICAgIG9zLmtpbGwod29ya2VyLnBpZCwgc2lnbmFsLlNJR0tJTEwpCiAgICAgICAgICAgICAgICAg ZWxzZToKICAgICAgICAgICAgICAgICAgICAgd29ya2VyLnRlcm1pbmF0ZSgpCisKKyAgICAgICAg ICAgIHNlbGYucXVldWUuY2xvc2UoKQorICAgICAgICAgICAgc2VsZi5xdWV1ZSA9IE5vbmUKKyAg ICAgICAgICAgIHNlbGYud29ya2VycyA9IFtdCg==