137135 2014-09-25 17:15:22 -0700 Get rid of Retry status in webkit-queues 2014-09-26 10:12:04 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap commit-queue glenn rniwa oldest_to_newest 1037352 0 ap 2014-09-25 17:15:22 -0700 Only the commit queue uses the Retry status, other queues simply release the lock once done with a cycle. The special handling for Retry is confusing and unnecessary. Also, we don't even count retries for anything but commit queue currently, which is no good. 1037354 1 238686 ap 2014-09-25 17:22:50 -0700 Created attachment 238686 proposed patch 1037502 2 ap 2014-09-26 10:12:04 -0700 Committed <http://trac.webkit.org/r174009>. 238686 2014-09-25 17:22:50 -0700 2014-09-25 17:29:08 -0700 proposed patch NoRetry.txt text/plain 11304 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3Mzk4MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM5IEBACisyMDE0LTA5LTI1ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEdldCByaWQgb2YgUmV0cnkgc3RhdHVzIGluIHdlYmtpdC1xdWV1ZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzEzNQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUXVldWVTdGF0 dXNTZXJ2ZXIvY29uZmlnL21lc3NhZ2VzLnB5OiBSZW1vdmVkIFJldHJ5LgorCisgICAgICAgICog UXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvcmVsZWFzZXBhdGNoLnB5OiBUaGlzIGlzIG5vdyBz dHJhaWdodGZvcndhcmQsIGFzIGl0CisgICAgICAgIG5vIGxvbmdlciBuZWVkcyB0byBjaGVjayB0 aGUgbGF0ZXN0IHN0YXR1cy4gSXQganVzdCBhbHdheXMgYm90aCB1bmxvY2tzIHRoZSBwYXRjaAor ICAgICAgICBhbmQgcmVtb3ZlcyBpdCBmcm9tIFdvcmtJdGVtcy4KKworICAgICAgICAqIFF1ZXVl U3RhdHVzU2VydmVyL2hhbmRsZXJzL3N1Ym1pdHRvZXdzLnB5OiAoU3VibWl0VG9FV1MuX3Nob3Vs ZF9hZGRfdG9fZXdzX3F1ZXVlKToKKyAgICAgICAgSSBkb24ndCB1bmRlcnN0YW5kIHdoeSB3ZSBl dmVuIG5lZWRlZCB0byBjaGVjayBmb3IgcmV0cmllcyBoZXJlLCBidXQgbm93IHRoYXQgdGhlcmUK KyAgICAgICAgYXJlIG5vIHJldHJpZXMsIHRoYXQgY29kZSBjYW4gZ28gdG8gL2Rldi9udWxsLgor CisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvbG9nZ2Vycy9yZWNvcmRwYXRjaGV2ZW50LnB5 OgorICAgICAgICAoUmVjb3JkUGF0Y2hFdmVudC5zdGFydGVkKToKKyAgICAgICAgKFJlY29yZFBh dGNoRXZlbnQucmV0cnlpbmcpOiBEZWxldGVkLgorICAgICAgICBGaXhlZCByZXRyeSBjb3VudGlu ZywgaXQgc2hvdWxkIHdvcmsgZm9yIGFsbCBxdWV1ZXMgbm93LgorCisgICAgICAgICogUXVldWVT dGF0dXNTZXJ2ZXIvbW9kZWwvcXVldWVzdGF0dXMucHk6CisgICAgICAgIChRdWV1ZVN0YXR1cy5p c19yZXRyeV9yZXF1ZXN0KTogRGVsZXRlZC4gVGhlc2UgYXJlIG5vIG1vcmUuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvc3RhdHVzc2VydmVyX21vY2sucHk6CisgICAg ICAgIChNb2NrU3RhdHVzU2VydmVyLnJlbGVhc2VfbG9jayk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weToKKyAgICAgICAgRGlkIHdo YXRldmVyIGl0IHRvb2sgdG8ga2VlcCBwYXNzaW5nIHRoZSB0ZXN0cy4gVGhlIHBhcnRpY3VsYXIg dGVzdCBkb2Vzbid0IHNlZW0KKyAgICAgICAgcXVpdGUgcmlnaHQsIGJ1dCB3aGF0ZXZlci4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHk6CisgICAg ICAgIChDb21taXRRdWV1ZS5wcm9jZXNzX3dvcmtfaXRlbSk6IEluc3RlYWQgb2YgcG9zdGluZyBh IHJldHJ5IHN0YXR1cywganVzdCB1bmxvY2sKKyAgICAgICAgYW5kIGxldCBvdGhlcnMgcGljayB1 cC4gQWxzbywgYWRkZWQgZXhwbGljaXQgcmV0dXJucyBmb3IgY2xhcml0eS4KKyAgICAgICAgKEFi c3RyYWN0UGF0Y2hRdWV1ZS5fZGlkX3JldHJ5KTogRGVsZXRlZC4KKwogMjAxNC0wOS0yNSAgRGVh biBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIFNhaWQgdG8gdGhlIGNv bnRyaWJ1dG9ycyBsaXN0IHNvIGhpcyBuYW1lIGNvbXBsZXRlcyBpbiBidWd6aWxsYS4KSW5kZXg6 IFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2NvbmZpZy9tZXNzYWdlcy5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9jb25maWcvbWVzc2FnZXMucHkJKHJldmlzaW9uIDE3 Mzk3OCkKKysrIFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2NvbmZpZy9tZXNzYWdlcy5weQkod29y a2luZyBjb3B5KQpAQCAtMjksNSArMjksNCBAQAogIyBUaGVzZSBtdXN0IGJlIGluIHN5bmMgd2l0 aCB3ZWJraXQtcGF0Y2gncyBBYnN0cmFjdFF1ZXVlLgogcGFzc19zdGF0dXMgPSAiUGFzcyIKIGZh aWxfc3RhdHVzID0gIkZhaWwiCi1yZXRyeV9zdGF0dXMgPSAiUmV0cnkiCiBlcnJvcl9zdGF0dXMg PSAiRXJyb3IiCkluZGV4OiBUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy9yZWxlYXNl cGF0Y2gucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMv cmVsZWFzZXBhdGNoLnB5CShyZXZpc2lvbiAxNzM5NzgpCisrKyBUb29scy9RdWV1ZVN0YXR1c1Nl cnZlci9oYW5kbGVycy9yZWxlYXNlcGF0Y2gucHkJKHdvcmtpbmcgY29weSkKQEAgLTU0LDEzICs1 NCw3IEBAIGNsYXNzIFJlbGVhc2VQYXRjaChVcGRhdGVCYXNlKToKICAgICAgICAgIyBJZGVhbGx5 IHdlIHNob3VsZCB1c2UgYSB0cmFuc2FjdGlvbiBmb3IgdGhlIGNhbGxzIHRvCiAgICAgICAgICMg V29ya0l0ZW1zIGFuZCBBY3RpdmVXb3JrSXRlbXMuCiAKLSAgICAgICAgIyBPbmx5IHJlbW92ZSBp dCBmcm9tIHRoZSBxdWV1ZSBpZiB0aGUgbGFzdCBtZXNzYWdlIGlzIG5vdCBhIHJldHJ5IHJlcXVl c3QuCi0gICAgICAgICMgQWxsb3cgcmVtb3ZpbmcgaXQgZnJvbSB0aGUgcXVldWUgZXZlbiBpZiB0 aGVyZSBpcyBubyBsYXN0X3N0YXR1cyBmb3IgZWFzaWVyIHRlc3RpbmcuCi0gICAgICAgIGlmIG5v dCBsYXN0X3N0YXR1cyBvciBub3QgbGFzdF9zdGF0dXMuaXNfcmV0cnlfcmVxdWVzdCgpOgotICAg ICAgICAgICAgcXVldWUud29ya19pdGVtcygpLnJlbW92ZV93b3JrX2l0ZW0oYXR0YWNobWVudF9p ZCkKLSAgICAgICAgICAgIFJlY29yZFBhdGNoRXZlbnQuc3RvcHBlZChhdHRhY2htZW50X2lkLCBx dWV1ZV9uYW1lKQotICAgICAgICBlbHNlOgotICAgICAgICAgICAgUmVjb3JkUGF0Y2hFdmVudC5y ZXRyeWluZyhhdHRhY2htZW50X2lkLCBxdWV1ZV9uYW1lKQorICAgICAgICBxdWV1ZS53b3JrX2l0 ZW1zKCkucmVtb3ZlX3dvcmtfaXRlbShhdHRhY2htZW50X2lkKQorICAgICAgICBSZWNvcmRQYXRj aEV2ZW50LnN0b3BwZWQoYXR0YWNobWVudF9pZCwgcXVldWVfbmFtZSkKIAotICAgICAgICAjIEFs d2F5cyByZWxlYXNlIHRoZSBsb2NrIG9uIHRoZSBpdGVtLgogICAgICAgICBxdWV1ZS5hY3RpdmVf d29ya19pdGVtcygpLmV4cGlyZV9pdGVtKGF0dGFjaG1lbnRfaWQpCkluZGV4OiBUb29scy9RdWV1 ZVN0YXR1c1NlcnZlci9oYW5kbGVycy9zdWJtaXR0b2V3cy5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy9zdWJtaXR0b2V3cy5weQkocmV2aXNpb24gMTcz OTc4KQorKysgVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvc3VibWl0dG9ld3MucHkJ KHdvcmtpbmcgY29weSkKQEAgLTQ1LDE0ICs0NSwxMSBAQCBjbGFzcyBTdWJtaXRUb0VXUyhVcGRh dGVCYXNlKToKICAgICAgICAgIyBpbiBhZGRpbmcgdGhpbmdzIHRvIHRoZSBjb21taXQtcXVldWUg d2hlbiB0aGV5IHdvbid0IGJlIHByb2Nlc3NlZCBieSBpdC4KICAgICAgICAgYXNzZXJ0KHF1ZXVl LmlzX2V3cygpKQogICAgICAgICBsYXRlc3Rfc3RhdHVzID0gYXR0YWNobWVudC5zdGF0dXNfZm9y X3F1ZXVlKHF1ZXVlKQotICAgICAgICBpZiBub3QgbGF0ZXN0X3N0YXR1czoKLSAgICAgICAgICAg IHJldHVybiBUcnVlCi0gICAgICAgICMgT25seSBldmVyIHJlLXN1Ym1pdCB0byB0aGUgRVdTIGlm IHRoZSBFV1Mgc3BlY2lmaWNhbGx5IHJlcXVlc3RlZCBhIHJldHJ5LgotICAgICAgICAjIFRoaXMg YWxsb3dzIHVzIHRvIHJlc3RhcnQgdGhlIEVXUyBmZWVkZXIgcXVldWUsIHdpdGhvdXQgYWxsIHI/ IHBhdGNoZXMKLSAgICAgICAgIyBiZWluZyByZXRyaWVkIGFzIGEgcmVzdWx0IG9mIHRoYXQgcmVz dGFydCEKLSAgICAgICAgIyBJbiBzb21lIGZ1dHVyZSB2ZXJzaW9uIHdlIG1pZ2h0IGFkZCBhICJm b3JjZSIgYnV0dG9uIHRvIGFsbG93IHRoZSB1c2VyCi0gICAgICAgICMgdG8gb3ZlcnJpZGUgdGhp cyByZXN0cmljdGlvbi4KLSAgICAgICAgcmV0dXJuIGxhdGVzdF9zdGF0dXMuaXNfcmV0cnlfcmVx dWVzdCgpCisgICAgICAgICMgVGhlIGZlZWRlciBxdWV1ZSBvbmx5IHN1Ym1pdHMgZWFjaCBwYXRj aCBvbmNlIG5vcm1hbGx5LCBidXQgaXQgbG9zZXMgaXRzIG1lbW9yeQorICAgICAgICAjIHdoZW4g cmVzdGFydGVkLiBXZSBkbyBub3Qgd2FudCB0byByZS1hZGQgYWxsIHBhdGNoZXMgaWYgdGhhdCBo YXBwZW5zLgorICAgICAgICAjIEluIHRoZSBmdXR1cmUgd2UgbWlnaHQgYWRkIGEgImZvcmNlIiBi dXR0b24gdG8gYWxsb3cgdGhlIHVzZXIgdG8gcmV0cnkgcGF0Y2hlcworICAgICAgICAjIHRoYXQg d2VyZSBwcmV2aW91c2x5IHN1Ym1pdHRlZC4KKyAgICAgICAgcmV0dXJuIG5vdCBsYXRlc3Rfc3Rh dHVzCiAKICAgICBkZWYgX2FkZF9hdHRhY2htZW50X3RvX2V3c19xdWV1ZXMoc2VsZiwgYXR0YWNo bWVudCk6CiAgICAgICAgIGZvciBxdWV1ZSBpbiBRdWV1ZS5hbGxfZXdzKCk6ICAjIGFsbF9ld3Mo KSBjdXJyZW50bHkgaW5jbHVkZXMgdGhlIHN0eWxlLXF1ZXVlCkluZGV4OiBUb29scy9RdWV1ZVN0 YXR1c1NlcnZlci9sb2dnZXJzL3JlY29yZHBhdGNoZXZlbnQucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvUXVldWVTdGF0dXNTZXJ2ZXIvbG9nZ2Vycy9yZWNvcmRwYXRjaGV2ZW50LnB5CShyZXZpc2lv biAxNzM5NzgpCisrKyBUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9sb2dnZXJzL3JlY29yZHBhdGNo ZXZlbnQucHkJKHdvcmtpbmcgY29weSkKQEAgLTEsNCArMSw1IEBACiAjIENvcHlyaWdodCAoQykg MjAxMyBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIw MTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zIGFyZQpAQCAtNDEsMzIgKzQyLDI1IEBAIGNsYXNzIFJlY29yZFBhdGNoRXZlbnQob2Jq ZWN0KToKICAgICAgICAgICAgIHF1ZXVlX2xvZy5wdXQoKQogCiAgICAgQGNsYXNzbWV0aG9kCi0g ICAgZGVmIHJldHJ5aW5nKGNscywgYXR0YWNobWVudF9pZCwgcXVldWVfbmFtZSwgYm90X2lkPU5v bmUpOgorICAgIGRlZiBzdGFydGVkKGNscywgYXR0YWNobWVudF9pZCwgcXVldWVfbmFtZSwgYm90 X2lkPU5vbmUpOgogICAgICAgICBwYXRjaF9sb2cgPSBQYXRjaExvZy5sb29rdXBfaWZfZXhpc3Rz KGF0dGFjaG1lbnRfaWQsIHF1ZXVlX25hbWUpCiAgICAgICAgIGlmIG5vdCBwYXRjaF9sb2c6Ci0g ICAgICAgICAgICBXYXJuaW5nTG9nLnJlY29yZCgicGF0Y2hsb2cgbWlzc2luZyIsICJJbiByZXRy eWluZyBldmVudC4iLCBhdHRhY2htZW50X2lkLCBxdWV1ZV9uYW1lLCBib3RfaWQpCisgICAgICAg ICAgICBXYXJuaW5nTG9nLnJlY29yZCgicGF0Y2hsb2cgbWlzc2luZyIsICJJbiBzdGFydGVkIGV2 ZW50LiIsIGF0dGFjaG1lbnRfaWQsIHF1ZXVlX25hbWUsIGJvdF9pZCkKICAgICAgICAgICAgIHJl dHVybgogCiAgICAgICAgIGlmIGJvdF9pZDoKICAgICAgICAgICAgIHBhdGNoX2xvZy5ib3RfaWQg PSBib3RfaWQKLSAgICAgICAgcGF0Y2hfbG9nLnJldHJ5X2NvdW50ICs9IDEKLSAgICAgICAgcGF0 Y2hfbG9nLnB1dCgpCiAKLSAgICAgICAgcXVldWVfbG9nID0gUXVldWVMb2cuZ2V0X2N1cnJlbnQo cXVldWVfbmFtZSwgcXVldWVfbG9nX2R1cmF0aW9uKQotICAgICAgICBxdWV1ZV9sb2cucGF0Y2hf cmV0cnlfY291bnQgKz0gMQotICAgICAgICBxdWV1ZV9sb2cucHV0KCkKLQotICAgIEBjbGFzc21l dGhvZAotICAgIGRlZiBzdGFydGVkKGNscywgYXR0YWNobWVudF9pZCwgcXVldWVfbmFtZSwgYm90 X2lkPU5vbmUpOgotICAgICAgICBwYXRjaF9sb2cgPSBQYXRjaExvZy5sb29rdXBfaWZfZXhpc3Rz KGF0dGFjaG1lbnRfaWQsIHF1ZXVlX25hbWUpCi0gICAgICAgIGlmIG5vdCBwYXRjaF9sb2c6Ci0g ICAgICAgICAgICBXYXJuaW5nTG9nLnJlY29yZCgicGF0Y2hsb2cgbWlzc2luZyIsICJJbiBzdGFy dGVkIGV2ZW50LiIsIGF0dGFjaG1lbnRfaWQsIHF1ZXVlX25hbWUsIGJvdF9pZCkKLSAgICAgICAg ICAgIHJldHVybgorICAgICAgICAjIEFuIGV4aXN0aW5nIHdhaXRfZHVyYXRpb24gaW1wbGllcyB0 aGUgcGF0Y2ggaGFkIGJlZW4gc3RhcnRlZCBwcmV2aW91c2x5IGFuZCBpcworICAgICAgICAjIGJl aW5nIHBpY2tlZCB1cCBhZ2FpbiBiZWNhdXNlIGl0IGhhZCBleHBpcmVkLCBvciB3YXMgcmVsZWFz ZWQuCisgICAgICAgIGlmIHBhdGNoX2xvZy53YWl0X2R1cmF0aW9uOgorICAgICAgICAgICAgcGF0 Y2hfbG9nLnJldHJ5X2NvdW50ICs9IDEKKyAgICAgICAgICAgIHBhdGNoX2xvZy5wdXQoKQogCi0g ICAgICAgICMgQW4gZXhpc3Rpbmcgd2FpdF9kdXJhdGlvbiBpbXBsaWVzIHRoZSBwYXRjaCBoYWQg YmVlbiBzdGFydGVkIHByZXZpb3VzbHkgYW5kIGlzIGJlaW5nIHBpY2tlZCB1cCBhZ2FpbiBiZWNh dXNlIGl0IGhhZCBleHBpcmVkLgotICAgICAgICBpZiBub3QgcGF0Y2hfbG9nLndhaXRfZHVyYXRp b246Ci0gICAgICAgICAgICBpZiBib3RfaWQ6Ci0gICAgICAgICAgICAgICAgcGF0Y2hfbG9nLmJv dF9pZCA9IGJvdF9pZAorICAgICAgICAgICAgcXVldWVfbG9nID0gUXVldWVMb2cuZ2V0X2N1cnJl bnQocXVldWVfbmFtZSwgcXVldWVfbG9nX2R1cmF0aW9uKQorICAgICAgICAgICAgcXVldWVfbG9n LnBhdGNoX3JldHJ5X2NvdW50ICs9IDEKKyAgICAgICAgICAgIHF1ZXVlX2xvZy5wdXQoKQorICAg ICAgICBlbHNlOgogICAgICAgICAgICAgcGF0Y2hfbG9nLmNhbGN1bGF0ZV93YWl0X2R1cmF0aW9u KCkKICAgICAgICAgICAgIHBhdGNoX2xvZy5wdXQoKQogCkluZGV4OiBUb29scy9RdWV1ZVN0YXR1 c1NlcnZlci9tb2RlbC9xdWV1ZXN0YXR1cy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9RdWV1ZVN0 YXR1c1NlcnZlci9tb2RlbC9xdWV1ZXN0YXR1cy5weQkocmV2aXNpb24gMTczOTc4KQorKysgVG9v bHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9kZWwvcXVldWVzdGF0dXMucHkJKHdvcmtpbmcgY29weSkK QEAgLTQwLDYgKzQwLDMgQEAgY2xhc3MgUXVldWVTdGF0dXMoZGIuTW9kZWwsIFF1ZXVlUHJvcGVy dAogICAgIG1lc3NhZ2UgPSBkYi5TdHJpbmdQcm9wZXJ0eShtdWx0aWxpbmU9VHJ1ZSkKICAgICBk YXRlID0gZGIuRGF0ZVRpbWVQcm9wZXJ0eShhdXRvX25vd19hZGQ9VHJ1ZSkKICAgICByZXN1bHRz X2ZpbGUgPSBkYi5CbG9iUHJvcGVydHkoKQotCi0gICAgZGVmIGlzX3JldHJ5X3JlcXVlc3Qoc2Vs Zik6Ci0gICAgICAgIHJldHVybiBzZWxmLm1lc3NhZ2UgPT0gbWVzc2FnZXMucmV0cnlfc3RhdHVz CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvc3RhdHVzc2VydmVyX21v Y2sucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3N0 YXR1c3NlcnZlcl9tb2NrLnB5CShyZXZpc2lvbiAxNzM5NzgpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9uZXQvc3RhdHVzc2VydmVyX21vY2sucHkJKHdvcmtpbmcgY29weSkKQEAg LTUyLDYgKzUyLDkgQEAgY2xhc3MgTW9ja1N0YXR1c1NlcnZlcihvYmplY3QpOgogICAgIGRlZiBy ZWxlYXNlX3dvcmtfaXRlbShzZWxmLCBxdWV1ZV9uYW1lLCBwYXRjaCk6CiAgICAgICAgIF9sb2cu aW5mbygiTU9DSzogcmVsZWFzZV93b3JrX2l0ZW06ICVzICVzIiAlIChxdWV1ZV9uYW1lLCBwYXRj aC5pZCgpKSkKIAorICAgIGRlZiByZWxlYXNlX2xvY2soc2VsZiwgcXVldWVfbmFtZSwgcGF0Y2gp OgorICAgICAgICBfbG9nLmluZm8oIk1PQ0s6IHJlbGVhc2VfbG9jazogJXMgJXMiICUgKHF1ZXVl X25hbWUsIHBhdGNoLmlkKCkpKQorCiAgICAgZGVmIHVwZGF0ZV93b3JrX2l0ZW1zKHNlbGYsIHF1 ZXVlX25hbWUsIHdvcmtfaXRlbXMpOgogICAgICAgICBzZWxmLl93b3JrX2l0ZW1zID0gd29ya19p dGVtcwogICAgICAgICBfbG9nLmluZm8oIk1PQ0s6IHVwZGF0ZV93b3JrX2l0ZW1zOiAlcyAlcyIg JSAocXVldWVfbmFtZSwgd29ya19pdGVtcykpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkJKHJldmlzaW9uIDE3Mzk3OSkKKysrIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkJKHdvcmtpbmcgY29weSkK QEAgLTY1LDcgKzY1LDYgQEAgY2xhc3MgQWJzdHJhY3RRdWV1ZShDb21tYW5kLCBRdWV1ZUVuZ2lu ZQogCiAgICAgX3Bhc3Nfc3RhdHVzID0gIlBhc3MiCiAgICAgX2ZhaWxfc3RhdHVzID0gIkZhaWwi Ci0gICAgX3JldHJ5X3N0YXR1cyA9ICJSZXRyeSIKICAgICBfZXJyb3Jfc3RhdHVzID0gIkVycm9y IgogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG9wdGlvbnM9Tm9uZSk6ICMgRGVmYXVsdCB2YWx1 ZXMgc2hvdWxkIG5ldmVyIGJlIGNvbGxlY3Rpb25zIChsaWtlIFtdKSBhcyBkZWZhdWx0IHZhbHVl cyBhcmUgc2hhcmVkIGJldHdlZW4gaW52b2NhdGlvbnMKQEAgLTIzOSwxMCArMjM4LDYgQEAgY2xh c3MgQWJzdHJhY3RQYXRjaFF1ZXVlKEFic3RyYWN0UXVldWUpOgogICAgICAgICBzZWxmLl91cGRh dGVfc3RhdHVzKHNlbGYuX2ZhaWxfc3RhdHVzLCBwYXRjaCkKICAgICAgICAgc2VsZi5fcmVsZWFz ZV93b3JrX2l0ZW0ocGF0Y2gpCiAKLSAgICBkZWYgX2RpZF9yZXRyeShzZWxmLCBwYXRjaCk6Ci0g ICAgICAgIHNlbGYuX3VwZGF0ZV9zdGF0dXMoc2VsZi5fcmV0cnlfc3RhdHVzLCBwYXRjaCkKLSAg ICAgICAgc2VsZi5fcmVsZWFzZV93b3JrX2l0ZW0ocGF0Y2gpCi0KICAgICBkZWYgX2RpZF9lcnJv cihzZWxmLCBwYXRjaCwgcmVhc29uKToKICAgICAgICAgbWVzc2FnZSA9ICIlczogJXMiICUgKHNl bGYuX2Vycm9yX3N0YXR1cywgcmVhc29uKQogICAgICAgICBzZWxmLl91cGRhdGVfc3RhdHVzKG1l c3NhZ2UsIHBhdGNoKQpAQCAtMzI1LDcgKzMyMCw4IEBAIGNsYXNzIENvbW1pdFF1ZXVlKFBhdGNo UHJvY2Vzc2luZ1F1ZXVlLCAKICAgICAgICAgICAgIGlmIHRhc2sucnVuKCk6CiAgICAgICAgICAg ICAgICAgc2VsZi5fZGlkX3Bhc3MocGF0Y2gpCiAgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUK LSAgICAgICAgICAgIHNlbGYuX2RpZF9yZXRyeShwYXRjaCkKKyAgICAgICAgICAgIHNlbGYuX3Vu bG9ja19wYXRjaChwYXRjaCkKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICBleGNl cHQgU2NyaXB0RXJyb3IsIGU6CiAgICAgICAgICAgICB2YWxpZGF0b3IgPSBDb21taXR0ZXJWYWxp ZGF0b3Ioc2VsZi5fdG9vbCkKICAgICAgICAgICAgIHZhbGlkYXRvci5yZWplY3RfcGF0Y2hfZnJv bV9jb21taXRfcXVldWUocGF0Y2guaWQoKSwgc2VsZi5fZXJyb3JfbWVzc2FnZV9mb3JfYnVnKHRh c2ssIHBhdGNoLCBlKSkKQEAgLTMzMyw2ICszMjksNyBAQCBjbGFzcyBDb21taXRRdWV1ZShQYXRj aFByb2Nlc3NpbmdRdWV1ZSwgCiAgICAgICAgICAgICBpZiByZXN1bHRzX2FyY2hpdmU6CiAgICAg ICAgICAgICAgICAgc2VsZi5fdXBsb2FkX3Jlc3VsdHNfYXJjaGl2ZV9mb3JfcGF0Y2gocGF0Y2gs IHJlc3VsdHNfYXJjaGl2ZSkKICAgICAgICAgICAgIHNlbGYuX2RpZF9mYWlsKHBhdGNoKQorICAg ICAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAgICBkZWYgX2ZhaWxpbmdfdGVzdHNfbWVzc2FnZShz ZWxmLCB0YXNrLCBwYXRjaCk6CiAgICAgICAgIHJlc3VsdHMgPSB0YXNrLnJlc3VsdHNfZnJvbV9w YXRjaF90ZXN0X3J1bihwYXRjaCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy9xdWV1ZXNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weQkocmV2aXNpb24gMTczOTc4 KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVz dC5weQkod29ya2luZyBjb3B5KQpAQCAtNDA1LDggKzQwNSw3IEBAIFJ1bm5pbmc6IHdlYmtpdC1w YXRjaCAtLXN0YXR1cy1ob3N0PWV4YW0KIE1PQ0s6IHVwZGF0ZV9zdGF0dXM6IGNvbW1pdC1xdWV1 ZSBCdWlsdCBwYXRjaAogUnVubmluZzogd2Via2l0LXBhdGNoIC0tc3RhdHVzLWhvc3Q9ZXhhbXBs ZS5jb20gYnVpbGQtYW5kLXRlc3QgLS1uby1jbGVhbiAtLW5vLXVwZGF0ZSAtLXRlc3QgLS1ub24t aW50ZXJhY3RpdmUgLS1wb3J0PW1hYwogTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVl IFBhc3NlZCB0ZXN0cwotTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIFJldHJ5Ci1N T0NLOiByZWxlYXNlX3dvcmtfaXRlbTogY29tbWl0LXF1ZXVlIDEwMDAwCitNT0NLOiByZWxlYXNl X2xvY2s6IGNvbW1pdC1xdWV1ZSAxMDAwMAogIiIiCiAgICAgICAgIHNlbGYubWF4RGlmZiA9IE5v bmUKICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHF1ZXVlLnBy b2Nlc3Nfd29ya19pdGVtLCBbUXVldWVzVGVzdC5tb2NrX3dvcmtfaXRlbV0sIGV4cGVjdGVkX2xv Z3M9ZXhwZWN0ZWRfbG9ncykK