229004 2021-08-11 08:35:51 -0700 [check-github-mirror-integrity] Differentiate between slow sync and collapsed commits 2021-08-12 08:23:46 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap ryanhaddad webkit-bug-importer oldest_to_newest 1783502 0 jbedard 2021-08-11 08:35:51 -0700 We should modify check-github-mirror-integrity to distinguish between the sync process being slow (or broken) and git-svn collapsing commits. 1783503 1 webkit-bug-importer 2021-08-11 08:36:21 -0700 <rdar://problem/81795644> 1783510 2 435350 jbedard 2021-08-11 08:50:35 -0700 Created attachment 435350 Patch 1783511 3 435350 ap 2021-08-11 08:55:00 -0700 Comment on attachment 435350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435350&action=review > Tools/Scripts/check-github-mirror-integrity:58 > + print('This indicates a serious error with the repository, please inform admin@webkit.org urgently') Do we still need to ask people to inform admin@webkit.org, given that emails are already sent? Maybe this should say something like "A notification will be sent to WebKit admins". 1783515 4 435350 jbedard 2021-08-11 09:08:52 -0700 Comment on attachment 435350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435350&action=review >> Tools/Scripts/check-github-mirror-integrity:58 >> + print('This indicates a serious error with the repository, please inform admin@webkit.org urgently') > > Do we still need to ask people to inform admin@webkit.org, given that emails are already sent? Maybe this should say something like "A notification will be sent to WebKit admins". Probably not, I don't expect this script will be run out of automation 1783526 5 435355 jbedard 2021-08-11 09:21:18 -0700 Created attachment 435355 Patch 1783566 6 435350 aakash_jain 2021-08-11 11:14:37 -0700 Comment on attachment 435350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435350&action=review > Tools/Scripts/check-github-mirror-integrity:48 > + timestamps_equal = mirror_tip.timestamp == canonical_tip.timestamp what is this timestamp? is it timestamp of tot commit? > Tools/Scripts/check-github-mirror-integrity:55 > + if timestamps_equal and mirror_tip.identifier != canonical_tip.identifier: How is this case possible? Also what if timestamps_equal is False? Does that go to default failure case? If so, is this if condition even required? > Tools/Scripts/check-github-mirror-integrity:63 > + print('GitHub is {} behind svn.webkit.org, but seems to be updating, This is ok.'.format(pluralize(difference, 'commit'))) how do we know about "seems to be updating" 1783586 7 jbedard 2021-08-11 12:01:30 -0700 (In reply to Aakash Jain from comment #6) > Comment on attachment 435350 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=435350&action=review > > > Tools/Scripts/check-github-mirror-integrity:48 > > + timestamps_equal = mirror_tip.timestamp == canonical_tip.timestamp > > what is this timestamp? is it timestamp of tot commit? Yes, it's the timestamp of the tot commit for a given repository representation. > > > Tools/Scripts/check-github-mirror-integrity:55 > > + if timestamps_equal and mirror_tip.identifier != canonical_tip.identifier: > > How is this case possible? > Also what if timestamps_equal is False? Does that go to default failure > case? If so, is this if condition even required? This case is the one we're really looking out for. Where git-svn thinks that it's correctly updated things (ie, the timestamps for the time of tree match), but the identifier indicates that we've missed a commit. > > > Tools/Scripts/check-github-mirror-integrity:63 > > + print('GitHub is {} behind svn.webkit.org, but seems to be updating, This is ok.'.format(pluralize(difference, 'commit'))) > > how do we know about "seems to be updating" To get to this case, two things must be true: 1) identifiers don't match 2) The timestamp of the tip of tree SVN commit is recent enough that we could plausibly be in the process of updating the mirror It's the second bit that leads us to believe we are still updating. Not enough time has passed to be suspicious of the mirror process yet, I figure we should usually have everything forwarded within 5 minutes of the original commit. 1783651 8 435350 aakash_jain 2021-08-11 15:15:19 -0700 Comment on attachment 435350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435350&action=review r=me with comments >>> Tools/Scripts/check-github-mirror-integrity:55 >>> + if timestamps_equal and mirror_tip.identifier != canonical_tip.identifier: >> >> How is this case possible? >> Also what if timestamps_equal is False? Does that go to default failure case? If so, is this if condition even required? > > This case is the one we're really looking out for. Where git-svn thinks that it's correctly updated things (ie, the timestamps for the time of tree match), but the identifier indicates that we've missed a commit. ok >>> Tools/Scripts/check-github-mirror-integrity:58 >>> + print('This indicates a serious error with the repository, please inform admin@webkit.org urgently') >> >> Do we still need to ask people to inform admin@webkit.org, given that emails are already sent? Maybe this should say something like "A notification will be sent to WebKit admins". > > Probably not, I don't expect this script will be run out of automation we run this in automation in commit-queue > Tools/Scripts/check-github-mirror-integrity:62 > + if time.time() < canonical_tip.timestamp + 5 * 60: Might be better to save this 5 minute time in a variable, e.g. TIME_LIMIT_FOR_SYNCING = 5*60 >>> Tools/Scripts/check-github-mirror-integrity:63 >>> + print('GitHub is {} behind svn.webkit.org, but seems to be updating, This is ok.'.format(pluralize(difference, 'commit'))) >> >> how do we know about "seems to be updating" > > To get to this case, two things must be true: > 1) identifiers don't match > 2) The timestamp of the tip of tree SVN commit is recent enough that we could plausibly be in the process of updating the mirror > > It's the second bit that leads us to believe we are still updating. Not enough time has passed to be suspicious of the mirror process yet, I figure we should usually have everything forwarded within 5 minutes of the original commit. It would be better to say "might be updating", instead of "seems to be updating", since we have no indication if it is updating or is permanently stuck for some reason. 1783822 9 435421 jbedard 2021-08-12 07:53:58 -0700 Created attachment 435421 Patch for landing 1783825 10 ews-feeder 2021-08-12 08:23:45 -0700 Committed r280967 (240473@main): <https://commits.webkit.org/240473@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435421. 435350 2021-08-11 08:50:35 -0700 2021-08-11 09:21:16 -0700 Patch bug-229004-20210811085034.patch text/plain 3188 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwOTA3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWQ4YjdkMjlhMDM5OTlkM2JkMzhhYzU2NjE5NjVhMmQ3 MTQxZjBlYi4uMWM2ODk4YWMxMjk5ZWQ4ZmFiODEzYzU0NTdhMWE2MjM5ZTg1ODJlOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTA4LTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbY2hlY2stZ2l0aHViLW1pcnJvci1pbnRlZ3JpdHldIERpZmZlcmVudGlhdGUgYmV0 d2VlbiBzbG93IHN5bmMgYW5kIGNvbGxhcHNlZCBjb21taXRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkwMDQKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzgxNzk1NjQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogU2NyaXB0cy9jaGVjay1naXRodWItbWlycm9yLWludGVncml0eTogVXNlIGNvbW1p dCB0aW1lc3RhbXBzIHRvIGRpZmZlcmVudGlhdGUgYmV0d2VlbiBhIHNsb3cgc3luYyBiZXR3ZWVu IHN2bi53ZWJraXQub3JnCisgICAgICAgIGFuZCBHaXRIdWIgYW5kIGdpdC1zdm4gY29tYmluaW5n IGNvbW1pdHMKKwogMjAyMS0wOC0xMSAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4K IAogICAgICAgICBbV1BFXSBIYW5kbGUgZXNjYXBlIGtleSBpbiB3cGVLZXlTeW1Gb3JLZXlSZWYK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY2hlY2stZ2l0aHViLW1pcnJvci1pbnRlZ3JpdHkg Yi9Ub29scy9TY3JpcHRzL2NoZWNrLWdpdGh1Yi1taXJyb3ItaW50ZWdyaXR5CmluZGV4IGU5OTFh OWY2OTUyNTlhMzY5YjIyYjJlMzYzODFjY2RjODM0ZDI5Y2YuLjQxNDhmZDY5YjU2MWViOTA3ZWEx NGZiYjc3MjYwNDBiYTU0Njg1ZTggMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY2hlY2stZ2l0 aHViLW1pcnJvci1pbnRlZ3JpdHkKKysrIGIvVG9vbHMvU2NyaXB0cy9jaGVjay1naXRodWItbWly cm9yLWludGVncml0eQpAQCAtMjcsNiArMjcsNyBAQCBpbXBvcnQgc3lzCiBpbXBvcnQgdGltZQog CiBmcm9tIHdlYmtpdHB5IGltcG9ydCB3ZWJraXRzY21weQorZnJvbSB3ZWJraXRjb3JlcHkuc3Ry aW5nX3V0aWxzIGltcG9ydCBwbHVyYWxpemUKIGZyb20gd2Via2l0c2NtcHkgaW1wb3J0IGxvY2Fs LCByZW1vdGUKIAogCkBAIC00NCwxNyArNDUsMjYgQEAgZGVmIG1haW4oKToKICAgICBtaXJyb3Jf dGlwID0gbWlycm9yLmNvbW1pdChicmFuY2g9J21haW4nKQogICAgIGNhbm9uaWNhbF90aXAgPSBy ZXBvc2l0b3J5LmNvbW1pdChicmFuY2g9J3RydW5rJykKIAotICAgIGlmIG1pcnJvcl90aXAuaWRl bnRpZmllciA9PSBjYW5vbmljYWxfdGlwLmlkZW50aWZpZXI6CisgICAgdGltZXN0YW1wc19lcXVh bCA9IG1pcnJvcl90aXAudGltZXN0YW1wID09IGNhbm9uaWNhbF90aXAudGltZXN0YW1wCisKKyAg ICBpZiB0aW1lc3RhbXBzX2VxdWFsIGFuZCBtaXJyb3JfdGlwLmlkZW50aWZpZXIgPT0gY2Fub25p Y2FsX3RpcC5pZGVudGlmaWVyOgogICAgICAgICBwcmludCgnR2l0SHViIGFuZCBzdm4ud2Via2l0 Lm9yZyBhcmUgaW4gc3luYycpCiAgICAgICAgIHByaW50KGYnSEVBRCBjb21taXQgb24gR2l0SHVi IHttaXJyb3JfdGlwfSBtYXRjaGVzIEhFQUQgY29tbWl0IG9uIHN2bi53ZWJraXQub3JnIHtjYW5v bmljYWxfdGlwfScpCiAgICAgICAgIHJldHVybiAwCiAKLSAgICBpZiB0aW1lLnRpbWUoKSA+PSBj YW5vbmljYWxfdGlwLnRpbWVzdGFtcCAtIDUgKiA2MCBhbmQgbWlycm9yX3RpcC5pZGVudGlmaWVy ID09IGNhbm9uaWNhbF90aXAuaWRlbnRpZmllciAtIDE6Ci0gICAgICAgIHByaW50KCdHaXRIdWIg aXMgMSBjb21taXQgYmVoaW5kIHN2bi53ZWJraXQub3JnLiBUaGlzIGlzIG9rLicpCisgICAgaWYg dGltZXN0YW1wc19lcXVhbCBhbmQgbWlycm9yX3RpcC5pZGVudGlmaWVyICE9IGNhbm9uaWNhbF90 aXAuaWRlbnRpZmllcjoKKyAgICAgICAgcHJpbnQoJ0VSUk9SOiBHaXRIdWIgYW5kIHN2bi53ZWJr aXQub3JnIGFyZSBvdXQgb2Ygc3luYycpCisgICAgICAgIHByaW50KGYnSEVBRCBjb21taXQgb24g R2l0SHViIHttaXJyb3JfdGlwfSBvdXQgb2Ygc3luYyB3aXRoIEhFQUQgY29tbWl0IG9uIHN2bi53 ZWJraXQub3JnIHtjYW5vbmljYWxfdGlwfScpCisgICAgICAgIHByaW50KCdUaGlzIGluZGljYXRl cyBhIHNlcmlvdXMgZXJyb3Igd2l0aCB0aGUgcmVwb3NpdG9yeSwgcGxlYXNlIGluZm9ybSBhZG1p bkB3ZWJraXQub3JnIHVyZ2VudGx5JykKKyAgICAgICAgcmV0dXJuIDEKKworICAgIGRpZmZlcmVu Y2UgPSBjYW5vbmljYWxfdGlwLmlkZW50aWZpZXIgLSBtaXJyb3JfdGlwLmlkZW50aWZpZXIKKyAg ICBpZiB0aW1lLnRpbWUoKSA8IGNhbm9uaWNhbF90aXAudGltZXN0YW1wICsgNSAqIDYwOgorICAg ICAgICBwcmludCgnR2l0SHViIGlzIHt9IGJlaGluZCBzdm4ud2Via2l0Lm9yZywgYnV0IHNlZW1z IHRvIGJlIHVwZGF0aW5nLCBUaGlzIGlzIG9rLicuZm9ybWF0KHBsdXJhbGl6ZShkaWZmZXJlbmNl LCAnY29tbWl0JykpKQogICAgICAgICBwcmludChmJ0hFQUQgY29tbWl0IG9uIEdpdEh1YiB7bWly cm9yX3RpcH0gc2xpZ2h0bHkgYmVoaW5kIEhFQUQgY29tbWl0IG9uIHN2bi53ZWJraXQub3JnIHtj YW5vbmljYWxfdGlwfScpCiAgICAgICAgIHJldHVybiAwCiAKLSAgICBwcmludCgnRVJST1I6IEdp dEh1YiBhbmQgc3ZuLndlYmtpdC5vcmcgYXJlIG91dCBvZiBzeW5jJykKKyAgICBwcmludCgnRVJS T1I6IEdpdEh1YiBpcyBub3Qgc3luY2luZyBmcm9tIHN2bi53ZWJraXQub3JnIGFuZCBpcyB7fSBi ZWhpbmQnLmZvcm1hdChwbHVyYWxpemUoZGlmZmVyZW5jZSwgJ2NvbW1pdCcpKSkKICAgICBwcmlu dChmJ0hFQUQgY29tbWl0IG9uIEdpdEh1YiB7bWlycm9yX3RpcH0gb3V0IG9mIHN5bmMgd2l0aCBI RUFEIGNvbW1pdCBvbiBzdm4ud2Via2l0Lm9yZyB7Y2Fub25pY2FsX3RpcH0nKQogICAgIHByaW50 KCdUaGlzIGluZGljYXRlcyBhIHNlcmlvdXMgZXJyb3Igd2l0aCB0aGUgcmVwb3NpdG9yeSwgcGxl YXNlIGluZm9ybSBhZG1pbkB3ZWJraXQub3JnIHVyZ2VudGx5JykKICAgICByZXR1cm4gMQo= 435355 2021-08-11 09:21:18 -0700 2021-08-12 07:53:56 -0700 Patch bug-229004-20210811092117.patch text/plain 3082 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwOTEwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWQ4YjdkMjlhMDM5OTlkM2JkMzhhYzU2NjE5NjVhMmQ3 MTQxZjBlYi4uMWM2ODk4YWMxMjk5ZWQ4ZmFiODEzYzU0NTdhMWE2MjM5ZTg1ODJlOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTA4LTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbY2hlY2stZ2l0aHViLW1pcnJvci1pbnRlZ3JpdHldIERpZmZlcmVudGlhdGUgYmV0 d2VlbiBzbG93IHN5bmMgYW5kIGNvbGxhcHNlZCBjb21taXRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkwMDQKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzgxNzk1NjQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogU2NyaXB0cy9jaGVjay1naXRodWItbWlycm9yLWludGVncml0eTogVXNlIGNvbW1p dCB0aW1lc3RhbXBzIHRvIGRpZmZlcmVudGlhdGUgYmV0d2VlbiBhIHNsb3cgc3luYyBiZXR3ZWVu IHN2bi53ZWJraXQub3JnCisgICAgICAgIGFuZCBHaXRIdWIgYW5kIGdpdC1zdm4gY29tYmluaW5n IGNvbW1pdHMKKwogMjAyMS0wOC0xMSAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4K IAogICAgICAgICBbV1BFXSBIYW5kbGUgZXNjYXBlIGtleSBpbiB3cGVLZXlTeW1Gb3JLZXlSZWYK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY2hlY2stZ2l0aHViLW1pcnJvci1pbnRlZ3JpdHkg Yi9Ub29scy9TY3JpcHRzL2NoZWNrLWdpdGh1Yi1taXJyb3ItaW50ZWdyaXR5CmluZGV4IGU5OTFh OWY2OTUyNTlhMzY5YjIyYjJlMzYzODFjY2RjODM0ZDI5Y2YuLjM4OWRmZWUyZjVlMjVjOTRiOGVm MjA5NGVmNmM1YmY4NWQxZmE5ZmQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY2hlY2stZ2l0 aHViLW1pcnJvci1pbnRlZ3JpdHkKKysrIGIvVG9vbHMvU2NyaXB0cy9jaGVjay1naXRodWItbWly cm9yLWludGVncml0eQpAQCAtMjcsNiArMjcsNyBAQCBpbXBvcnQgc3lzCiBpbXBvcnQgdGltZQog CiBmcm9tIHdlYmtpdHB5IGltcG9ydCB3ZWJraXRzY21weQorZnJvbSB3ZWJraXRjb3JlcHkuc3Ry aW5nX3V0aWxzIGltcG9ydCBwbHVyYWxpemUKIGZyb20gd2Via2l0c2NtcHkgaW1wb3J0IGxvY2Fs LCByZW1vdGUKIAogCkBAIC00NCwxOSArNDUsMjYgQEAgZGVmIG1haW4oKToKICAgICBtaXJyb3Jf dGlwID0gbWlycm9yLmNvbW1pdChicmFuY2g9J21haW4nKQogICAgIGNhbm9uaWNhbF90aXAgPSBy ZXBvc2l0b3J5LmNvbW1pdChicmFuY2g9J3RydW5rJykKIAotICAgIGlmIG1pcnJvcl90aXAuaWRl bnRpZmllciA9PSBjYW5vbmljYWxfdGlwLmlkZW50aWZpZXI6CisgICAgdGltZXN0YW1wc19lcXVh bCA9IG1pcnJvcl90aXAudGltZXN0YW1wID09IGNhbm9uaWNhbF90aXAudGltZXN0YW1wCisKKyAg ICBpZiB0aW1lc3RhbXBzX2VxdWFsIGFuZCBtaXJyb3JfdGlwLmlkZW50aWZpZXIgPT0gY2Fub25p Y2FsX3RpcC5pZGVudGlmaWVyOgogICAgICAgICBwcmludCgnR2l0SHViIGFuZCBzdm4ud2Via2l0 Lm9yZyBhcmUgaW4gc3luYycpCiAgICAgICAgIHByaW50KGYnSEVBRCBjb21taXQgb24gR2l0SHVi IHttaXJyb3JfdGlwfSBtYXRjaGVzIEhFQUQgY29tbWl0IG9uIHN2bi53ZWJraXQub3JnIHtjYW5v bmljYWxfdGlwfScpCiAgICAgICAgIHJldHVybiAwCiAKLSAgICBpZiB0aW1lLnRpbWUoKSA+PSBj YW5vbmljYWxfdGlwLnRpbWVzdGFtcCAtIDUgKiA2MCBhbmQgbWlycm9yX3RpcC5pZGVudGlmaWVy ID09IGNhbm9uaWNhbF90aXAuaWRlbnRpZmllciAtIDE6Ci0gICAgICAgIHByaW50KCdHaXRIdWIg aXMgMSBjb21taXQgYmVoaW5kIHN2bi53ZWJraXQub3JnLiBUaGlzIGlzIG9rLicpCisgICAgaWYg dGltZXN0YW1wc19lcXVhbCBhbmQgbWlycm9yX3RpcC5pZGVudGlmaWVyICE9IGNhbm9uaWNhbF90 aXAuaWRlbnRpZmllcjoKKyAgICAgICAgcHJpbnQoJ0VSUk9SOiBHaXRIdWIgYW5kIHN2bi53ZWJr aXQub3JnIGFyZSBvdXQgb2Ygc3luYycpCisgICAgICAgIHByaW50KGYnSEVBRCBjb21taXQgb24g R2l0SHViIHttaXJyb3JfdGlwfSBvdXQgb2Ygc3luYyB3aXRoIEhFQUQgY29tbWl0IG9uIHN2bi53 ZWJraXQub3JnIHtjYW5vbmljYWxfdGlwfScpCisgICAgICAgIHJldHVybiAxCisKKyAgICBkaWZm ZXJlbmNlID0gY2Fub25pY2FsX3RpcC5pZGVudGlmaWVyIC0gbWlycm9yX3RpcC5pZGVudGlmaWVy CisgICAgaWYgdGltZS50aW1lKCkgPCBjYW5vbmljYWxfdGlwLnRpbWVzdGFtcCArIDUgKiA2MDoK KyAgICAgICAgcHJpbnQoJ0dpdEh1YiBpcyB7fSBiZWhpbmQgc3ZuLndlYmtpdC5vcmcsIGJ1dCBz ZWVtcyB0byBiZSB1cGRhdGluZywgVGhpcyBpcyBvay4nLmZvcm1hdChwbHVyYWxpemUoZGlmZmVy ZW5jZSwgJ2NvbW1pdCcpKSkKICAgICAgICAgcHJpbnQoZidIRUFEIGNvbW1pdCBvbiBHaXRIdWIg e21pcnJvcl90aXB9IHNsaWdodGx5IGJlaGluZCBIRUFEIGNvbW1pdCBvbiBzdm4ud2Via2l0Lm9y ZyB7Y2Fub25pY2FsX3RpcH0nKQogICAgICAgICByZXR1cm4gMAogCi0gICAgcHJpbnQoJ0VSUk9S OiBHaXRIdWIgYW5kIHN2bi53ZWJraXQub3JnIGFyZSBvdXQgb2Ygc3luYycpCisgICAgcHJpbnQo J0VSUk9SOiBHaXRIdWIgaXMgbm90IHN5bmNpbmcgZnJvbSBzdm4ud2Via2l0Lm9yZyBhbmQgaXMg e30gYmVoaW5kJy5mb3JtYXQocGx1cmFsaXplKGRpZmZlcmVuY2UsICdjb21taXQnKSkpCiAgICAg cHJpbnQoZidIRUFEIGNvbW1pdCBvbiBHaXRIdWIge21pcnJvcl90aXB9IG91dCBvZiBzeW5jIHdp dGggSEVBRCBjb21taXQgb24gc3ZuLndlYmtpdC5vcmcge2Nhbm9uaWNhbF90aXB9JykKLSAgICBw cmludCgnVGhpcyBpbmRpY2F0ZXMgYSBzZXJpb3VzIGVycm9yIHdpdGggdGhlIHJlcG9zaXRvcnks IHBsZWFzZSBpbmZvcm0gYWRtaW5Ad2Via2l0Lm9yZyB1cmdlbnRseScpCiAgICAgcmV0dXJuIDEK IAogCg== 435421 2021-08-12 07:53:58 -0700 2021-08-12 08:23:46 -0700 Patch for landing bug-229004-20210812075357.patch text/plain 3076 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDk2NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDIxLTA4LTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbY2hlY2stZ2l0aHViLW1pcnJvci1pbnRlZ3JpdHldIERpZmZlcmVudGlh dGUgYmV0d2VlbiBzbG93IHN5bmMgYW5kIGNvbGxhcHNlZCBjb21taXRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkwMDQKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzgxNzk1NjQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFha2FzaCBKYWluLgor CisgICAgICAgICogU2NyaXB0cy9jaGVjay1naXRodWItbWlycm9yLWludGVncml0eTogVXNlIGNv bW1pdCB0aW1lc3RhbXBzIHRvIGRpZmZlcmVudGlhdGUgYmV0d2VlbiBhIHNsb3cgc3luYyBiZXR3 ZWVuIHN2bi53ZWJraXQub3JnCisgICAgICAgIGFuZCBHaXRIdWIgYW5kIGdpdC1zdm4gY29tYmlu aW5nIGNvbW1pdHMKKwogMjAyMS0wOC0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gU2ltcGxpZnkgVGVzdFdlYktpdEFjY2Vzc2li aWxpdHkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvY2hlY2stZ2l0aHViLW1pcnJvci1pbnRlZ3JpdHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9jaGVjay1naXRodWItbWlycm9yLWludGVncml0 eQkocmV2aXNpb24gMjgwOTY2KQorKysgVG9vbHMvU2NyaXB0cy9jaGVjay1naXRodWItbWlycm9y LWludGVncml0eQkod29ya2luZyBjb3B5KQpAQCAtMjcsOSArMjcsMTMgQEAgaW1wb3J0IHN5cwog aW1wb3J0IHRpbWUKIAogZnJvbSB3ZWJraXRweSBpbXBvcnQgd2Via2l0c2NtcHkKK2Zyb20gd2Vi a2l0Y29yZXB5LnN0cmluZ191dGlscyBpbXBvcnQgcGx1cmFsaXplCiBmcm9tIHdlYmtpdHNjbXB5 IGltcG9ydCBsb2NhbCwgcmVtb3RlCiAKIAorU1lOQ19USU1FX0xJTUlUID0gNSAqIDYwICAjIDUg bWludXRlcworCisKIGRlZiBtYWluKCk6CiAgICAgY2FjaGVfcGF0aCA9IE5vbmUKICAgICB0cnk6 CkBAIC00NCwxOSArNDgsMjYgQEAgZGVmIG1haW4oKToKICAgICBtaXJyb3JfdGlwID0gbWlycm9y LmNvbW1pdChicmFuY2g9J21haW4nKQogICAgIGNhbm9uaWNhbF90aXAgPSByZXBvc2l0b3J5LmNv bW1pdChicmFuY2g9J3RydW5rJykKIAotICAgIGlmIG1pcnJvcl90aXAuaWRlbnRpZmllciA9PSBj YW5vbmljYWxfdGlwLmlkZW50aWZpZXI6CisgICAgdGltZXN0YW1wc19lcXVhbCA9IG1pcnJvcl90 aXAudGltZXN0YW1wID09IGNhbm9uaWNhbF90aXAudGltZXN0YW1wCisKKyAgICBpZiB0aW1lc3Rh bXBzX2VxdWFsIGFuZCBtaXJyb3JfdGlwLmlkZW50aWZpZXIgPT0gY2Fub25pY2FsX3RpcC5pZGVu dGlmaWVyOgogICAgICAgICBwcmludCgnR2l0SHViIGFuZCBzdm4ud2Via2l0Lm9yZyBhcmUgaW4g c3luYycpCiAgICAgICAgIHByaW50KGYnSEVBRCBjb21taXQgb24gR2l0SHViIHttaXJyb3JfdGlw fSBtYXRjaGVzIEhFQUQgY29tbWl0IG9uIHN2bi53ZWJraXQub3JnIHtjYW5vbmljYWxfdGlwfScp CiAgICAgICAgIHJldHVybiAwCiAKLSAgICBpZiB0aW1lLnRpbWUoKSA+PSBjYW5vbmljYWxfdGlw LnRpbWVzdGFtcCAtIDUgKiA2MCBhbmQgbWlycm9yX3RpcC5pZGVudGlmaWVyID09IGNhbm9uaWNh bF90aXAuaWRlbnRpZmllciAtIDE6Ci0gICAgICAgIHByaW50KCdHaXRIdWIgaXMgMSBjb21taXQg YmVoaW5kIHN2bi53ZWJraXQub3JnLiBUaGlzIGlzIG9rLicpCisgICAgaWYgdGltZXN0YW1wc19l cXVhbCBhbmQgbWlycm9yX3RpcC5pZGVudGlmaWVyICE9IGNhbm9uaWNhbF90aXAuaWRlbnRpZmll cjoKKyAgICAgICAgcHJpbnQoJ0VSUk9SOiBHaXRIdWIgYW5kIHN2bi53ZWJraXQub3JnIGFyZSBv dXQgb2Ygc3luYycpCisgICAgICAgIHByaW50KGYnSEVBRCBjb21taXQgb24gR2l0SHViIHttaXJy b3JfdGlwfSBvdXQgb2Ygc3luYyB3aXRoIEhFQUQgY29tbWl0IG9uIHN2bi53ZWJraXQub3JnIHtj YW5vbmljYWxfdGlwfScpCisgICAgICAgIHJldHVybiAxCisKKyAgICBkaWZmZXJlbmNlID0gY2Fu b25pY2FsX3RpcC5pZGVudGlmaWVyIC0gbWlycm9yX3RpcC5pZGVudGlmaWVyCisgICAgaWYgdGlt ZS50aW1lKCkgPCBjYW5vbmljYWxfdGlwLnRpbWVzdGFtcCArIFNZTkNfVElNRV9MSU1JVDoKKyAg ICAgICAgcHJpbnQoJ0dpdEh1YiBpcyB7fSBiZWhpbmQgc3ZuLndlYmtpdC5vcmcsIGJ1dCBtaWdo dCBiZSB1cGRhdGluZywgVGhpcyBpcyBvay4nLmZvcm1hdChwbHVyYWxpemUoZGlmZmVyZW5jZSwg J2NvbW1pdCcpKSkKICAgICAgICAgcHJpbnQoZidIRUFEIGNvbW1pdCBvbiBHaXRIdWIge21pcnJv cl90aXB9IHNsaWdodGx5IGJlaGluZCBIRUFEIGNvbW1pdCBvbiBzdm4ud2Via2l0Lm9yZyB7Y2Fu b25pY2FsX3RpcH0nKQogICAgICAgICByZXR1cm4gMAogCi0gICAgcHJpbnQoJ0VSUk9SOiBHaXRI dWIgYW5kIHN2bi53ZWJraXQub3JnIGFyZSBvdXQgb2Ygc3luYycpCisgICAgcHJpbnQoJ0VSUk9S OiBHaXRIdWIgaXMgbm90IHN5bmNpbmcgZnJvbSBzdm4ud2Via2l0Lm9yZyBhbmQgaXMge30gYmVo aW5kJy5mb3JtYXQocGx1cmFsaXplKGRpZmZlcmVuY2UsICdjb21taXQnKSkpCiAgICAgcHJpbnQo ZidIRUFEIGNvbW1pdCBvbiBHaXRIdWIge21pcnJvcl90aXB9IG91dCBvZiBzeW5jIHdpdGggSEVB RCBjb21taXQgb24gc3ZuLndlYmtpdC5vcmcge2Nhbm9uaWNhbF90aXB9JykKLSAgICBwcmludCgn VGhpcyBpbmRpY2F0ZXMgYSBzZXJpb3VzIGVycm9yIHdpdGggdGhlIHJlcG9zaXRvcnksIHBsZWFz ZSBpbmZvcm0gYWRtaW5Ad2Via2l0Lm9yZyB1cmdlbnRseScpCiAgICAgcmV0dXJuIDEKIAogCg==