227134 2021-06-17 11:30:42 -0700 [webkitcorepy] Retry downloads in Autoinstall 2021-06-17 14:27:25 -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 1770731 0 jbedard 2021-06-17 11:30:42 -0700 When Autoinstall fails to download a package, we should retry. Note that this retry doesn't extend to running the install operation, which shouldn't be flakey. 1770733 1 webkit-bug-importer 2021-06-17 11:31:09 -0700 <rdar://problem/79462182> 1770736 2 431693 jbedard 2021-06-17 11:34:48 -0700 Created attachment 431693 Patch 1770793 3 431693 aakash_jain 2021-06-17 13:23:34 -0700 Comment on attachment 431693 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431693&action=review > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:100 > + while count <= (AutoInstall.retry or 0): Do we need 0 here, can we just ensure AutoInstall.retry is always valid? > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:114 > + if count > (AutoInstall.retry or 0): Ditto > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:393 > + retry = 1 might be better to name it something like: number_of_retry > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:533 > + def set_retry(cls, retry): This method seems unused 1770800 4 431693 jbedard 2021-06-17 13:38:56 -0700 Comment on attachment 431693 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431693&action=review >> Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:100 >> + while count <= (AutoInstall.retry or 0): > > Do we need 0 here, can we just ensure AutoInstall.retry is always valid? This is to make sure we behave correctly in case retry is "None", and given that the variable doesn't have an _, None feels like a reasonable value >> Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:393 >> + retry = 1 > > might be better to name it something like: number_of_retry Will change it's name >> Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:533 >> + def set_retry(cls, retry): > > This method seems unused It is at the moment, but given this is part of a library, it seems like something someone might one to change at some point in the future 1770802 5 431693 aakash_jain 2021-06-17 13:43:09 -0700 Comment on attachment 431693 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431693&action=review >>> Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:100 >>> + while count <= (AutoInstall.retry or 0): >> >> Do we need 0 here, can we just ensure AutoInstall.retry is always valid? > > This is to make sure we behave correctly in case retry is "None", and given that the variable doesn't have an _, None feels like a reasonable value we can change the default value of retry to 0 1770805 6 jbedard 2021-06-17 13:49:12 -0700 (In reply to Aakash Jain from comment #5) > Comment on attachment 431693 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=431693&action=review > > >>> Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:100 > >>> + while count <= (AutoInstall.retry or 0): > >> > >> Do we need 0 here, can we just ensure AutoInstall.retry is always valid? > > > > This is to make sure we behave correctly in case retry is "None", and given that the variable doesn't have an _, None feels like a reasonable value > > we can change the default value of retry to 0 I think we want the default value to be 1. The problem here is if a caller of the library sets "retry" (or "times_to_retry" as will be in the next patch) to "None". Actually, the solution here might be to drop the `set_retry` function, but keep doing something sane when we get a value of "None". 1770809 7 431718 jbedard 2021-06-17 13:54:49 -0700 Created attachment 431718 Patch 1770819 8 ews-feeder 2021-06-17 14:27:24 -0700 Committed r279009 (238934@main): <https://commits.webkit.org/238934@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431718. 431693 2021-06-17 11:34:48 -0700 2021-06-17 13:54:46 -0700 Patch bug-227134-20210617113447.patch text/plain 4966 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODk5NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDIxLTA2LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBSZXRyeSBkb3dubG9hZHMgaW4gQXV0b2luc3Rh bGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzEz NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzk0NjIxODI+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxs LnB5OgorICAgICAgICAoUGFja2FnZS5BcmNoaXZlLmRvd25sb2FkKTogUmV0cnkgZmFpbGVkIGRv d25sb2FkcworICAgICAgICAoQXV0b0luc3RhbGwpOiBBbGxvdyBmb3IgYSBzaW5nbGUgcmV0cnkg YnkgZGVmYXVsdAorICAgICAgICAoQXV0b0luc3RhbGwuc2V0X3JldHJ5KTogU2V0IG51bWJlciBv ZiByZXRyaWVzLgorCiAyMDIxLTA2LTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2Vu QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIGVtcHR5IGhlYWRlciBXZWJUeXBlc0ludGVy bmFsLmgKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0 dXAucHkJKHJldmlzaW9uIDI3ODk5NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dGNvcmVweS9zZXR1cC5weQkod29ya2luZyBjb3B5KQpAQCAtMzAsNyArMzAsNyBAQCBkZWYgcmVh ZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdGNvcmVweScsCi0gICAgdmVyc2lvbj0n MC41LjE4JywKKyAgICB2ZXJzaW9uPScwLjUuMTknLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5 IGNvbnRhaW5pbmcgdmFyaW91cyBQeXRob24gc3VwcG9ydCBjbGFzc2VzIGFuZCBmdW5jdGlvbnMu JywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19p bml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQkocmV2aXNpb24gMjc4OTk1KQorKysgVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQko d29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQCBmcm9tIHdlYmtpdGNvcmVweS5vdXRwdXRf Y2FwdHVyZSBpbXBvcnQgCiBmcm9tIHdlYmtpdGNvcmVweS50YXNrX3Bvb2wgaW1wb3J0IFRhc2tQ b29sCiBmcm9tIHdlYmtpdGNvcmVweS5jcmVkZW50aWFscyBpbXBvcnQgY3JlZGVudGlhbHMKIAot dmVyc2lvbiA9IFZlcnNpb24oMCwgNSwgMTgpCit2ZXJzaW9uID0gVmVyc2lvbigwLCA1LCAxOSkK IAogZnJvbSB3ZWJraXRjb3JlcHkuYXV0b2luc3RhbGwgaW1wb3J0IFBhY2thZ2UsIEF1dG9JbnN0 YWxsCiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgpJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5 L2F1dG9pbnN0YWxsLnB5CShyZXZpc2lvbiAyNzg5OTUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CSh3b3JraW5nIGNv cHkpCkBAIC05NiwxOCArOTYsMzAgQEAgY2xhc3MgUGFja2FnZShvYmplY3QpOgogCiAgICAgICAg IGRlZiBkb3dubG9hZChzZWxmKToKICAgICAgICAgICAgIEF1dG9JbnN0YWxsLl92ZXJpZnlfaW5k ZXgoKQotICAgICAgICAgICAgcmVzcG9uc2UgPSBBdXRvSW5zdGFsbC5fcmVxdWVzdChzZWxmLmxp bmspCi0gICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgaWYgcmVzcG9uc2UuY29kZSAh PSAyMDA6Ci0gICAgICAgICAgICAgICAgICAgIHJhaXNlIElPRXJyb3IoJ0ZhaWxlZCB0byByZXRy aWV2ZSBQeXRob24gbW9kdWxlIHdpdGggcmVzcG9uc2UgY29kZSB7fScuZm9ybWF0KHJlc3BvbnNl LmNvZGUpKQotICAgICAgICAgICAgICAgIHdpdGggb3BlbihzZWxmLnBhdGgsICd3YicpIGFzIGZp bGU6Ci0gICAgICAgICAgICAgICAgICAgIHdoaWxlIFRydWU6Ci0gICAgICAgICAgICAgICAgICAg ICAgICBkYXRhID0gcmVzcG9uc2UucmVhZCgyICoqIDEzKQotICAgICAgICAgICAgICAgICAgICAg ICAgaWYgbm90IGRhdGE6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWsKLSAgICAg ICAgICAgICAgICAgICAgICAgIGZpbGUud3JpdGUoZGF0YSkKLSAgICAgICAgICAgIGZpbmFsbHk6 Ci0gICAgICAgICAgICAgICAgcmVzcG9uc2UuY2xvc2UoKQorICAgICAgICAgICAgY291bnQgPSAw CisgICAgICAgICAgICB3aGlsZSBjb3VudCA8PSAoQXV0b0luc3RhbGwucmV0cnkgb3IgMCk6Cisg ICAgICAgICAgICAgICAgcmVzcG9uc2UgPSBOb25lCisgICAgICAgICAgICAgICAgdHJ5OgorICAg ICAgICAgICAgICAgICAgICByZXNwb25zZSA9IEF1dG9JbnN0YWxsLl9yZXF1ZXN0KHNlbGYubGlu aykKKyAgICAgICAgICAgICAgICAgICAgaWYgbm90IHJlc3BvbnNlIG9yIHJlc3BvbnNlLmNvZGUg IT0gMjAwOgorICAgICAgICAgICAgICAgICAgICAgICAgcmFpc2UgSU9FcnJvcignRmFpbGVkIHRv IHJldHJpZXZlIFB5dGhvbiBtb2R1bGUgd2l0aCByZXNwb25zZSBjb2RlIHt9Jy5mb3JtYXQocmVz cG9uc2UuY29kZSkpCisgICAgICAgICAgICAgICAgICAgIHdpdGggb3BlbihzZWxmLnBhdGgsICd3 YicpIGFzIGZpbGU6CisgICAgICAgICAgICAgICAgICAgICAgICB3aGlsZSBUcnVlOgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGRhdGEgPSByZXNwb25zZS5yZWFkKDIgKiogMTMpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaWYgbm90IGRhdGE6CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlsZS53cml0 ZShkYXRhKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgICAgICAgICBleGNl cHQgKElPRXJyb3IsIFVSTEVycm9yKSBhcyBlOgorICAgICAgICAgICAgICAgICAgICBpZiBjb3Vu dCA+IChBdXRvSW5zdGFsbC5yZXRyeSBvciAwKToKKyAgICAgICAgICAgICAgICAgICAgICAgIHJh aXNlCisgICAgICAgICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAgICAgICBB dXRvSW5zdGFsbC5sb2coc3RyKGUpKQorICAgICAgICAgICAgICAgICAgICAgICAgQXV0b0luc3Rh bGwubG9nKCdGYWlsZWQgdG8gZG93bmxvYWQge30sIHJldHJ5aW5nJy5mb3JtYXQoc2VsZi5uYW1l KSkKKyAgICAgICAgICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgICAgICAgICBpZiByZXNw b25zZToKKyAgICAgICAgICAgICAgICAgICAgICAgIHJlc3BvbnNlLmNsb3NlKCkKKyAgICAgICAg ICAgICAgICAgICAgY291bnQgKz0gMQogCiAgICAgICAgIGRlZiB1bnBhY2soc2VsZiwgdGFyZ2V0 KToKICAgICAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmlzZmlsZShzZWxmLnBhdGgpOgpAQCAtMzc4 LDYgKzM5MCw3IEBAIGNsYXNzIEF1dG9JbnN0YWxsKG9iamVjdCk6CiAgICAgZGlyZWN0b3J5ID0g Tm9uZQogICAgIGluZGV4ID0gX2RlZmF1bHRfcHlwaV9pbmRleCgpCiAgICAgdGltZW91dCA9IDMw CisgICAgcmV0cnkgPSAxCiAgICAgdmVyc2lvbiA9IFZlcnNpb24oc3lzLnZlcnNpb25faW5mb1sw XSwgc3lzLnZlcnNpb25faW5mb1sxXSwgc3lzLnZlcnNpb25faW5mb1syXSkKICAgICBwYWNrYWdl cyA9IGRlZmF1bHRkaWN0KGxpc3QpCiAgICAgbWFuaWZlc3QgPSB7fQpAQCAtNTE3LDYgKzUzMCwx MiBAQCBjbGFzcyBBdXRvSW5zdGFsbChvYmplY3QpOgogICAgICAgICBjbHMudGltZW91dCA9IG1h dGguY2VpbCh0aW1lb3V0KQogCiAgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIHNldF9yZXRyeShj bHMsIHJldHJ5KToKKyAgICAgICAgaWYgcmV0cnkgaXMgbm90IE5vbmUgYW5kIHJldHJ5IDw9IDA6 CisgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCIne30nIGlzIGFuIGludmFsaWQgcmV0cnkg dmFsdWUiLmZvcm1hdChyZXRyeSkpCisgICAgICAgIGNscy5yZXRyeSA9IG1hdGguY2VpbChyZXRy eSkgaWYgcmV0cnkgZWxzZSBOb25lCisKKyAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgcmVnaXN0 ZXIoY2xzLCBwYWNrYWdlLCBsb2NhbD1GYWxzZSk6CiAgICAgICAgIGlmIGlzaW5zdGFuY2UocGFj a2FnZSwgUGFja2FnZSk6CiAgICAgICAgICAgICBpZiBjbHMucGFja2FnZXMuZ2V0KHBhY2thZ2Uu bmFtZSk6Cg== 431718 2021-06-17 13:54:49 -0700 2021-06-17 14:27:25 -0700 Patch bug-227134-20210617135447.patch text/plain 4467 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3OTAwNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIxLTA2LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBSZXRyeSBkb3dubG9hZHMgaW4gQXV0b2luc3Rh bGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzEz NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzk0NjIxODI+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3Jl cHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5 OgorICAgICAgICAoUGFja2FnZS5BcmNoaXZlLmRvd25sb2FkKTogUmV0cnkgZmFpbGVkIGRvd25s b2FkcworICAgICAgICAoQXV0b0luc3RhbGwpOiBBbGxvdyBmb3IgYSBzaW5nbGUgcmV0cnkgYnkg ZGVmYXVsdAorCiAyMDIxLTA2LTE3ICBXLkQuIFhpb25nICA8d194aW9uZ0BhcHBsZS5jb20+CiAK ICAgICAgICAgW2lPUyAxNV0gQWRkIGlPUyAxNSBzaW11bGF0b3IvZGV2aWNlIHRvIGJvdCB3YXRj aGVycycgZGFzaGJvYXJkCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3Jl cHkvc2V0dXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3NldHVwLnB5CShyZXZpc2lvbiAyNzkwMDUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkJKHdvcmtpbmcgY29weSkKQEAgLTMwLDcgKzMwLDcg QEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRjb3JlcHknLAotICAg IHZlcnNpb249JzAuNS4xOCcsCisgICAgdmVyc2lvbj0nMC41LjE5JywKICAgICBkZXNjcmlwdGlv bj0nTGlicmFyeSBjb250YWluaW5nIHZhcmlvdXMgUHl0aG9uIHN1cHBvcnQgY2xhc3NlcyBhbmQg ZnVuY3Rpb25zLicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lm aWVycz1bCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0 Y29yZXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3OTAwNSkK KysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19p bml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAgZnJvbSB3ZWJraXRjb3Jl cHkub3V0cHV0X2NhcHR1cmUgaW1wb3J0IAogZnJvbSB3ZWJraXRjb3JlcHkudGFza19wb29sIGlt cG9ydCBUYXNrUG9vbAogZnJvbSB3ZWJraXRjb3JlcHkuY3JlZGVudGlhbHMgaW1wb3J0IGNyZWRl bnRpYWxzCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDUsIDE4KQordmVyc2lvbiA9IFZlcnNpb24o MCwgNSwgMTkpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdl LCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKSW5kZXg6IFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dl YmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQkocmV2aXNpb24gMjc5MDA1KQorKysgVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQko d29ya2luZyBjb3B5KQpAQCAtOTYsMTggKzk2LDMwIEBAIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToK IAogICAgICAgICBkZWYgZG93bmxvYWQoc2VsZik6CiAgICAgICAgICAgICBBdXRvSW5zdGFsbC5f dmVyaWZ5X2luZGV4KCkKLSAgICAgICAgICAgIHJlc3BvbnNlID0gQXV0b0luc3RhbGwuX3JlcXVl c3Qoc2VsZi5saW5rKQotICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIGlmIHJlc3Bv bnNlLmNvZGUgIT0gMjAwOgotICAgICAgICAgICAgICAgICAgICByYWlzZSBJT0Vycm9yKCdGYWls ZWQgdG8gcmV0cmlldmUgUHl0aG9uIG1vZHVsZSB3aXRoIHJlc3BvbnNlIGNvZGUge30nLmZvcm1h dChyZXNwb25zZS5jb2RlKSkKLSAgICAgICAgICAgICAgICB3aXRoIG9wZW4oc2VsZi5wYXRoLCAn d2InKSBhcyBmaWxlOgotICAgICAgICAgICAgICAgICAgICB3aGlsZSBUcnVlOgotICAgICAgICAg ICAgICAgICAgICAgICAgZGF0YSA9IHJlc3BvbnNlLnJlYWQoMiAqKiAxMykKLSAgICAgICAgICAg ICAgICAgICAgICAgIGlmIG5vdCBkYXRhOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrCi0gICAgICAgICAgICAgICAgICAgICAgICBmaWxlLndyaXRlKGRhdGEpCi0gICAgICAgICAg ICBmaW5hbGx5OgotICAgICAgICAgICAgICAgIHJlc3BvbnNlLmNsb3NlKCkKKyAgICAgICAgICAg IGNvdW50ID0gMAorICAgICAgICAgICAgd2hpbGUgY291bnQgPD0gKEF1dG9JbnN0YWxsLnRpbWVz X3RvX3JldHJ5IG9yIDApOgorICAgICAgICAgICAgICAgIHJlc3BvbnNlID0gTm9uZQorICAgICAg ICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICAgICAgcmVzcG9uc2UgPSBBdXRvSW5zdGFs bC5fcmVxdWVzdChzZWxmLmxpbmspCisgICAgICAgICAgICAgICAgICAgIGlmIG5vdCByZXNwb25z ZSBvciByZXNwb25zZS5jb2RlICE9IDIwMDoKKyAgICAgICAgICAgICAgICAgICAgICAgIHJhaXNl IElPRXJyb3IoJ0ZhaWxlZCB0byByZXRyaWV2ZSBQeXRob24gbW9kdWxlIHdpdGggcmVzcG9uc2Ug Y29kZSB7fScuZm9ybWF0KHJlc3BvbnNlLmNvZGUpKQorICAgICAgICAgICAgICAgICAgICB3aXRo IG9wZW4oc2VsZi5wYXRoLCAnd2InKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgICAgICAgICAg d2hpbGUgVHJ1ZToKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhID0gcmVzcG9uc2Uu cmVhZCgyICoqIDEzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIG5vdCBkYXRhOgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZpbGUud3JpdGUoZGF0YSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuCisg ICAgICAgICAgICAgICAgZXhjZXB0IChJT0Vycm9yLCBVUkxFcnJvcikgYXMgZToKKyAgICAgICAg ICAgICAgICAgICAgaWYgY291bnQgPiAoQXV0b0luc3RhbGwudGltZXNfdG9fcmV0cnkgb3IgMCk6 CisgICAgICAgICAgICAgICAgICAgICAgICByYWlzZQorICAgICAgICAgICAgICAgICAgICBlbHNl OgorICAgICAgICAgICAgICAgICAgICAgICAgQXV0b0luc3RhbGwubG9nKHN0cihlKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgIEF1dG9JbnN0YWxsLmxvZygnRmFpbGVkIHRvIGRvd25sb2FkIHt9 LCByZXRyeWluZycuZm9ybWF0KHNlbGYubmFtZSkpCisgICAgICAgICAgICAgICAgZmluYWxseToK KyAgICAgICAgICAgICAgICAgICAgaWYgcmVzcG9uc2U6CisgICAgICAgICAgICAgICAgICAgICAg ICByZXNwb25zZS5jbG9zZSgpCisgICAgICAgICAgICAgICAgICAgIGNvdW50ICs9IDEKIAogICAg ICAgICBkZWYgdW5wYWNrKHNlbGYsIHRhcmdldCk6CiAgICAgICAgICAgICBpZiBub3Qgb3MucGF0 aC5pc2ZpbGUoc2VsZi5wYXRoKToKQEAgLTM3OCw2ICszOTAsNyBAQCBjbGFzcyBBdXRvSW5zdGFs bChvYmplY3QpOgogICAgIGRpcmVjdG9yeSA9IE5vbmUKICAgICBpbmRleCA9IF9kZWZhdWx0X3B5 cGlfaW5kZXgoKQogICAgIHRpbWVvdXQgPSAzMAorICAgIHRpbWVzX3RvX3JldHJ5ID0gMQogICAg IHZlcnNpb24gPSBWZXJzaW9uKHN5cy52ZXJzaW9uX2luZm9bMF0sIHN5cy52ZXJzaW9uX2luZm9b MV0sIHN5cy52ZXJzaW9uX2luZm9bMl0pCiAgICAgcGFja2FnZXMgPSBkZWZhdWx0ZGljdChsaXN0 KQogICAgIG1hbmlmZXN0ID0ge30K