222038 2021-02-17 06:26:15 -0800 commit-queue should retry when it fails to commit 2021-12-23 12:47:32 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224300 https://bugs.webkit.org/show_bug.cgi?id=234644 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1730245 0 aakash_jain 2021-02-17 06:26:15 -0800 commit-queue has been frequently failing to commit since we moved ews to github (see https://lists.webkit.org/pipermail/webkit-dev/2021-February/031686.html). Most of the times it succeeds on retry. One reason for that might be that there is a delay in syncing between svn.webkit.org and github.com (since we canonicalize the commits before pushing them to github which takes some time). Another reason for the failure is that sometimes between the time commit-queue updates to Tot, applies the patch and tries to commit; there might be another commit on trunk which modifies one of the file being modified in the patch (often ChangeLog), causing the file to be out of date. commit-queue should automatically retry to commit before giving up (while handling above situations appropriately). 1730246 1 420636 aakash_jain 2021-02-17 06:29:22 -0800 Created attachment 420636 Patch 1730248 2 aakash_jain 2021-02-17 06:30:24 -0800 Sample run: https://ews-build.webkit-uat.org/#/builders/26/builds/1707 1730282 3 ews-feeder 2021-02-17 08:23:24 -0800 Committed r273000: <https://commits.webkit.org/r273000> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420636. 1730283 4 webkit-bug-importer 2021-02-17 08:24:13 -0800 <rdar://problem/74434372> 1732108 5 aakash_jain 2021-02-22 06:13:18 -0800 This change was picked up by buildbot restart on 2021-02-20. 1739152 6 aakash_jain 2021-03-13 08:17:55 -0800 This retry helped in https://ews-build.webkit.org/#/builders/28/builds/9967 420636 2021-02-17 06:29:22 -0800 2021-02-17 08:23:24 -0800 Patch bug-222038-20210217092920.patch text/plain 3749 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3Mjk5NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIxLTAyLTE3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBjb21taXQtcXVldWUgc2hvdWxkIHJldHJ5IHdoZW4gaXQgZmFpbHMgdG8g Y29tbWl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjIwMzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IENJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6CisgICAgICAgIChQdXNoQ29tbWl0VG9XZWJL aXRSZXBvKToKKyAgICAgICAgKFB1c2hDb21taXRUb1dlYktpdFJlcG8uZXZhbHVhdGVDb21tYW5k KToKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OgorCiAy MDIxLTAyLTE3ICBEaWVnbyBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0ZsYXRwYWsgU0RLXSBTY3JpcHQgJ3dlYmtpdC1mbGF0cGFrLXJ1bi1uaWdodGx5JyBleHBl Y3RzIGRpZmZlcmVudCBmb3JtYXQgZm9yIGEgYnVpbHQgcHJvZHVjdCBuYW1lCkluZGV4OiBUb29s cy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NJU3Vw cG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI3Mjk5NikKKysrIFRvb2xzL0NJU3Vw cG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTMwNzYsNiArMzA3Niw3 IEBAIGNsYXNzIFB1c2hDb21taXRUb1dlYktpdFJlcG8oc2hlbGwuU2hlbGwKICAgICBjb21tYW5k ID0gWydnaXQnLCAnc3ZuJywgJ2Rjb21taXQnLCAnLS1ybWRpciddCiAgICAgY29tbWl0X3N1Y2Nl c3NfcmVnZXhwID0gJ15Db21taXR0ZWQgcig/UDxzdm5fcmV2aXNpb24+XGQrKSQnCiAgICAgaGFs dE9uRmFpbHVyZSA9IEZhbHNlCisgICAgTUFYX1JFVFJZID0gMgogCiAgICAgZGVmIF9faW5pdF9f KHNlbGYsICoqa3dhcmdzKToKICAgICAgICAgc2hlbGwuU2hlbGxDb21tYW5kLl9faW5pdF9fKHNl bGYsIHRpbWVvdXQ9NSAqIDYwLCBsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykKQEAgLTMwOTcs NiArMzA5OCwxMiBAQCBjbGFzcyBQdXNoQ29tbWl0VG9XZWJLaXRSZXBvKHNoZWxsLlNoZWxsCiAg ICAgICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJyZW50U3RlcChbQ29tbWVudE9u QnVnKCksIFJlbW92ZUZsYWdzT25QYXRjaCgpLCBDbG9zZUJ1ZygpXSkKICAgICAgICAgICAgIHNl bGYuYWRkVVJMKCdye30nLmZvcm1hdChzdm5fcmV2aXNpb24pLCBzZWxmLnVybF9mb3JfcmV2aXNp b24oc3ZuX3JldmlzaW9uKSkKICAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHJldHJ5X2NvdW50 ID0gaW50KHNlbGYuZ2V0UHJvcGVydHkoJ3JldHJ5X2NvdW50JywgMCkpCisgICAgICAgICAgICBp ZiByZXRyeV9jb3VudCA8IHNlbGYuTUFYX1JFVFJZOgorICAgICAgICAgICAgICAgIHNlbGYuc2V0 UHJvcGVydHkoJ3JldHJ5X2NvdW50JywgcmV0cnlfY291bnQgKyAxKQorICAgICAgICAgICAgICAg IHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRTdGVwKFtDaGVja091dFNvdXJjZSgpLCBT aG93SWRlbnRpZmllcigpLCBVcGRhdGVXb3JraW5nRGlyZWN0b3J5KCksIEFwcGx5UGF0Y2goKSwg Q3JlYXRlTG9jYWxHSVRDb21taXQoKSwgUHVzaENvbW1pdFRvV2ViS2l0UmVwbygpXSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gcmMKKwogICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYnVn emlsbGFfY29tbWVudF90ZXh0Jywgc2VsZi5jb21tZW50X3RleHRfZm9yX2J1ZygpKQogICAgICAg ICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1hcnknLCAnRmFpbGVkIHRv IGNvbW1pdCB0byBXZWJLaXQgcmVwb3NpdG9yeScpCiAgICAgICAgICAgICBzZWxmLmJ1aWxkLmFk ZFN0ZXBzQWZ0ZXJDdXJyZW50U3RlcChbQ29tbWVudE9uQnVnKCksIFNldENvbW1pdFF1ZXVlTWlu dXNGbGFnT25QYXRjaCgpXSkKSW5kZXg6IFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNf dW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVw c191bml0dGVzdC5weQkocmV2aXNpb24gMjcyOTk2KQorKysgVG9vbHMvQ0lTdXBwb3J0L2V3cy1i dWlsZC9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzc4MCw4ICszNzgwLDI3 IEBAIGNsYXNzIFRlc3RQdXNoQ29tbWl0VG9XZWJLaXRSZXBvKEJ1aWxkU3QKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScpLCBO b25lKQogICAgICAgICByZXR1cm4gcmMKIAorICAgIGRlZiB0ZXN0X2ZhaWx1cmVfcmV0cnkoc2Vs Zik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKFB1c2hDb21taXRUb1dlYktpdFJlcG8oKSkKKyAg ICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAnMjM0NScpCisgICAgICAgIHNlbGYu ZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3 a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTMwMCwKKyAgICAgICAgICAg ICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICBj b21tYW5kPVsnZ2l0JywgJ3N2bicsICdkY29tbWl0JywgJy0tcm1kaXInXSkgKworICAgICAgICAg ICAgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nVW5leHBlY3RlZCBmYWlsdXJlJykg KworICAgICAgICAgICAgMiwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUo cmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nRmFpbGVkIHRvIHB1c2ggY29tbWl0IHRvIFdl YmtpdCByZXBvc2l0b3J5JykKKyAgICAgICAgcmMgPSBzZWxmLnJ1blN0ZXAoKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ3JldHJ5X2NvdW50JyksIDEpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5nZXRQcm9wZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1h cnknKSwgTm9uZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdi dWd6aWxsYV9jb21tZW50X3RleHQnKSwgTm9uZSkKKyAgICAgICAgcmV0dXJuIHJjCisKICAgICBk ZWYgdGVzdF9mYWlsdXJlKHNlbGYpOgogICAgICAgICBzZWxmLnNldHVwU3RlcChQdXNoQ29tbWl0 VG9XZWJLaXRSZXBvKCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3JldHJ5X2NvdW50Jywg UHVzaENvbW1pdFRvV2ViS2l0UmVwby5NQVhfUkVUUlkpCiAgICAgICAgIHNlbGYuc2V0UHJvcGVy dHkoJ3BhdGNoX2lkJywgJzIzNDUnKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRz KAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAo=