172577 2017-05-24 21:16:03 -0700 Syncing script shouldn't schedule a build request when there is a build from another test group in progress 2017-05-25 14:10:13 -0700 1 1 1 Unclassified WebKit Perf Dashboard Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa cdumez dewei_zhu rniwa slewis webkit-bug-importer oldest_to_newest 1312526 0 rniwa 2017-05-24 21:16:03 -0700 Apparently the syncing script can end up scheduling a new build request for a test group when there is an in-progress build request from another test group. 1312527 1 webkit-bug-importer 2017-05-24 21:16:33 -0700 <rdar://problem/32395049> 1312536 2 rniwa 2017-05-24 21:44:04 -0700 When a buildbot gets restarted, it'd re-schedule the currently running build. This can result in multiple builds to be pending simultaneously. The real problem here is that sync-buildbot.js couldn't recover from this state even through I explicitly add a test case for it because the test case itself was broken. 1312541 3 311195 rniwa 2017-05-24 22:09:38 -0700 Created attachment 311195 Fixes the bug 1312868 4 311195 rniwa 2017-05-25 14:10:11 -0700 Comment on attachment 311195 Fixes the bug Clearing flags on attachment: 311195 Committed r217448: <http://trac.webkit.org/changeset/217448> 1312869 5 rniwa 2017-05-25 14:10:13 -0700 All reviewed patches have been landed. Closing bug. 311195 2017-05-24 22:09:38 -0700 2017-05-25 14:10:11 -0700 Fixes the bug bug-172577-20170524220937.patch text/plain 14014 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NDA3CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA5MDg3OTU2ZGQ4OGNkMDMxNTFjOTg3NGU3Y2U4YjYxMWUzMDNmMTg1Li5mNzdiNGUxOWFl YjcwNzc5NGQ1NTliZDNkMTkwMGE1ODU3NDBkZDlhIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSwzNCBAQAogMjAxNy0wNS0yNCAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAorICAgICAgICBTeW5jaW5nIHNjcmlwdCBzaG91bGRuJ3Qgc2NoZWR1bGUg YSBidWlsZCByZXF1ZXN0IHdoZW4gdGhlcmUgaXMgYSBidWlsZCBmcm9tIGFub3RoZXIgdGVzdCBn cm91cCBpbiBwcm9ncmVzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTcyNTc3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjM5NTA0OT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEgYnVpbGRi b3QgbWFzdGVyIGdldHMgcmVzdGFydGVkIHdoaWxlIHRoZXJlIGlzIGFuIGluLXByb2dyZXNzIGJ1 aWxkIGFuZCBhIHBlbmRpbmcgYnVpbGQsIHRoZSBtYXN0ZXIgd2lsbAorICAgICAgICByZS1zY2hl ZHVsZSB0aGUgY3VycmVudGx5IHJ1bm5pbmcgYnVpbGQsIGFuZCB0aGlzIGNhbiByZXN1bHQgaW4g bXVsdGlwbGUgYnVpbGQgcmVxdWVzdHMgZnJvbSBkaWZmZXJlbnQgdGVzdAorICAgICAgICBncm91 cHMgYmVpbmcgc2NoZWR1bGVkIHNpbXVsdGFuZW91c2x5LgorCisgICAgICAgIHN5bmMtYnVpbGRi b3QuanMgd2FzIHN1cHBvc2VkIHRvIHJlY292ZXIgZnJvbSB0aGlzIHN0YXRlIGJ5IG9ubHkgcHJv Y2Vzc2luZyBidWlsZCByZXF1ZXN0cyBmcm9tIG9uZSB0ZXN0IGdyb3VwCisgICAgICAgIGF0IGEg dGltZSBhbmQgZXZlbnR1YWxseSBjb21lIGJhY2sgdG8gYSBzdGF0ZSB3aGVyZSBvbmx5IGEgc2lu Z2xlIHRlc3QgZ3JvdXAgaXMgcnVubmluZyBwZXIgYnVpbGRib3Qgc2xhdmUuCisKKyAgICAgICAg V2UgaGFkIGEgdGVzdCBmb3IgdGhpcyBwYXJ0aWN1bGFyIGNhc2UgYnV0IGl0IHdhc24ndCB0ZXN0 aW5nIHdoYXQgaXQgY2xhaW1lZCB0byB0ZXN0LiBSZXdyaXRlbiB0aGUgdGVzdCBjYXNlCisgICAg ICAgIGFuZCBmaXhlZCB0aGUgYnVnIGJ5IGV4cGxpY2l0bHkgY2hlY2tpbmcgdGhpcyBjb25kaXRp b24gYW5kIHRyZWF0aW5nIGl0IGFzIGlmIHRoZXJlIGlzIGEgcGVuZGluZyBidWlsZCBhbHJlYWR5 CisgICAgICAgIHNjaGVkdWxlZCBpbiB0aGUgYnVpbGRlciBpbiB0aGlzIGNhc2UuCisKKyAgICAg ICAgKiBwdWJsaWMvYXBpL3Rlc3QtZ3JvdXBzLnBocDoKKyAgICAgICAgKG1haW4pOiBGaXhlZCBh IHJlZ3Jlc3Npb24gZnJvbSByMjE3Mzk3LiBSZXR1cm4gdGhlIHBsYXRmb3JtIElEIG9mIHRoZSBm aXJzdCByZXF1ZXN0IHdoZW4gbm9uZSBvZiB0aGUgcmVxdWV0cworICAgICAgICBoYXZlIGJlZW4g cHJvY2Vzc2VkIHlldCBvciBhbGwgb2YgdGhlbSBoYWQgZmFpbGVkLgorICAgICAgICAqIHNlcnZl ci10ZXN0cy90b29scy1idWlsZGJvdC10cmlnZ2VyYWJsZS10ZXN0cy5qczogUmV3cml0dGVuIGEg dGVzdCBjYXNlIGludGVuZGVkIHRvIGNvdmVyIHRoaXMgYnVnLgorICAgICAgICAoLmFzc2VydFJl cXVlc3RBbmRSZXNvbHZlKTogQWRkZWQuCisgICAgICAgICogdG9vbHMvanMvYnVpbGRib3Qtc3lu Y2VyLmpzOgorICAgICAgICAoQnVpbGRib3RTeW5jZXIucHJvdG90eXBlLnNjaGVkdWxlUmVxdWVz dEluR3JvdXBJZkF2YWlsYWJsZSk6IEZpeGVkIHRoZSBidWcuIEF2b2lkIHNjaGVkdWxpbmcgYSBu ZXcgcmVxdWVzdCBvbgorICAgICAgICB0aGlzIHN5bmNlciBpZiB0aGVyZSBpcyBhIGJ1aWxkIGlu IHByb2dyZXNzIGZvciBhIHRlc3QgZ3JvdXAgZGlmZmVyZW50IGZyb20gdGhhdCBvZiB0aGUgbmV3 IHJlcXVlc3QuIFJldXNlIHRoZQorICAgICAgICBjb2RlIHdlIGhhZCB0byBkZWFsIHdpdGggYSBw ZW5kaW5nIGJ1aWxkIGZvciB0aGlzIHB1cnBvc2UuCisKKzIwMTctMDUtMjQgIFJ5b3N1a2UgTml3 YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKICAgICAgICAgT3BlbmluZyBhbiBhbmFseXNpcyB0YXNr IGZyb20gdGhlIHF1ZXVlIHBhZ2UgaXMgYnJva2VuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzI1NTkKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMy Mzg5NzA4PgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hcGkv dGVzdC1ncm91cHMucGhwIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hcGkvdGVz dC1ncm91cHMucGhwCmluZGV4IDhjZGQ2OTZlNWMwODRiODAzNWQzOTgzMmJiMzlkMGNiMTZmM2Mz ZDguLjkxMTBjN2U4MDg0YjNhZDIyMjYwYjA0ODNjM2I5ZTljNjlhOWIzZjEgMTAwNjQ0Ci0tLSBh L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvYXBpL3Rlc3QtZ3JvdXBzLnBocAorKysg Yi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2FwaS90ZXN0LWdyb3Vwcy5waHAKQEAg LTQzLDYgKzQzLDExIEBAIGZ1bmN0aW9uIG1haW4oJHBhdGgpIHsKICAgICAgICAgICAgIFdIRVJF IHJ1bl9jb25maWcgPSBjb25maWdfaWQgQU5EIHJ1bl9idWlsZCA9IHJlcXVlc3RfYnVpbGQgQU5E IHJlcXVlc3RfZ3JvdXAgPSAkMScsIGFycmF5KCRncm91cF9pZCkpOwogICAgICAgICBpZiAoJHBs YXRmb3JtcykKICAgICAgICAgICAgICRncm91cFsncGxhdGZvcm0nXSA9ICRwbGF0Zm9ybXNbMF1b J2NvbmZpZ19wbGF0Zm9ybSddOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICRmaXJzdF9y ZXF1ZXN0ID0gJGRiLT5zZWxlY3RfZmlyc3Rfcm93KCdidWlsZF9yZXF1ZXN0cycsICdyZXF1ZXN0 JywgYXJyYXkoJ2dyb3VwJyA9PiAkZ3JvdXBfaWQpLCAnb3JkZXInKTsKKyAgICAgICAgICAgIGlm ICgkZmlyc3RfcmVxdWVzdCkKKyAgICAgICAgICAgICAgICAkZ3JvdXBbJ3BsYXRmb3JtJ10gPSAk Zmlyc3RfcmVxdWVzdFsncmVxdWVzdF9wbGF0Zm9ybSddOworICAgICAgICB9CiAgICAgfQogCiAg ICAgJGJ1aWxkX3JlcXVlc3RzID0gJGJ1aWxkX3JlcXVlc3RzX2ZldGNoZXItPnJlc3VsdHMoKTsK ZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMt YnVpbGRib3QtdHJpZ2dlcmFibGUtdGVzdHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv c2VydmVyLXRlc3RzL3Rvb2xzLWJ1aWxkYm90LXRyaWdnZXJhYmxlLXRlc3RzLmpzCmluZGV4IGQx NWIzY2MwYWQxNDlhNDg2ZWI3ZWU2ZTcyNTUxYmFjZGRhYzc4M2YuLmQzMmVlYzc4ZDk1OGNmZDll MjFjNGFjNjIwM2IxZTNiNmY3ZGE2NDIgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMtYnVpbGRib3QtdHJpZ2dlcmFibGUtdGVzdHMuanMKKysr IGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy90b29scy1idWlsZGJvdC10 cmlnZ2VyYWJsZS10ZXN0cy5qcwpAQCAtOSw2ICs5LDEzIEBAIGNvbnN0IFRlc3RTZXJ2ZXIgPSBy ZXF1aXJlKCcuL3Jlc291cmNlcy90ZXN0LXNlcnZlci5qcycpOwogY29uc3QgcHJlcGFyZVNlcnZl clRlc3QgPSByZXF1aXJlKCcuL3Jlc291cmNlcy9jb21tb24tb3BlcmF0aW9ucy5qcycpLnByZXBh cmVTZXJ2ZXJUZXN0OwogY29uc3QgTW9ja0xvZ2dlciA9IHJlcXVpcmUoJy4vcmVzb3VyY2VzL21v Y2stbG9nZ2VyLmpzJykuTW9ja0xvZ2dlcjsKIAorZnVuY3Rpb24gYXNzZXJ0UmVxdWVzdEFuZFJl c29sdmUocmVxdWVzdCwgbWV0aG9kLCB1cmwsIGNvbnRlbnQpCit7CisgICAgYXNzZXJ0LmVxdWFs KHJlcXVlc3QubWV0aG9kLCBtZXRob2QpOworICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0LnVybCwg dXJsKTsKKyAgICByZXF1ZXN0LnJlc29sdmUoY29udGVudCk7Cit9CisKIGRlc2NyaWJlKCdCdWls ZGJvdFRyaWdnZXJhYmxlJywgZnVuY3Rpb24gKCkgewogICAgIHByZXBhcmVTZXJ2ZXJUZXN0KHRo aXMpOwogCkBAIC02ODMsNyArNjkwLDEwIEBAIGRlc2NyaWJlKCdCdWlsZGJvdFRyaWdnZXJhYmxl JywgZnVuY3Rpb24gKCkgewogCiAgICAgICAgIGl0KCdzaG91bGQgcmVjb3ZlciBmcm9tIG11bHRp cGxlIHRlc3QgZ3JvdXBzIHJ1bm5pbmcgc2ltdWx0ZW5vdXNseScsICgpID0+IHsKICAgICAgICAg ICAgIGNvbnN0IGRiID0gVGVzdFNlcnZlci5kYXRhYmFzZSgpOworICAgICAgICAgICAgY29uc3Qg cmVxdWVzdHMgPSBNb2NrUmVtb3RlQVBJLnJlcXVlc3RzOworCiAgICAgICAgICAgICBsZXQgc3lu Y1Byb21pc2U7CisgICAgICAgICAgICBsZXQgdHJpZ2dlcmFibGU7CiAgICAgICAgICAgICByZXR1 cm4gUHJvbWlzZS5hbGwoWwogICAgICAgICAgICAgICAgIE1vY2tEYXRhLmFkZE1vY2tEYXRhKGRi LCBbJ2NvbXBsZXRlZCcsICdwZW5kaW5nJywgJ3BlbmRpbmcnLCAncGVuZGluZyddKSwKICAgICAg ICAgICAgICAgICBNb2NrRGF0YS5hZGRBbm90aGVyTW9ja1Rlc3RHcm91cChkYiwgWydjb21wbGV0 ZWQnLCAncGVuZGluZycsICdwZW5kaW5nJywgJ3BlbmRpbmcnXSkKQEAgLTY5Myw3MCArNzAzLDU0 IEBAIGRlc2NyaWJlKCdCdWlsZGJvdFRyaWdnZXJhYmxlJywgZnVuY3Rpb24gKCkgewogICAgICAg ICAgICAgICAgIGNvbnN0IGNvbmZpZyA9IE1vY2tEYXRhLm1vY2tUZXN0U3luY0NvbmZpZ1dpdGhT aW5nbGVCdWlsZGVyKCk7CiAgICAgICAgICAgICAgICAgY29uc3QgbG9nZ2VyID0gbmV3IE1vY2tM b2dnZXI7CiAgICAgICAgICAgICAgICAgY29uc3Qgc2xhdmVJbmZvID0ge25hbWU6ICdzeW5jLXNs YXZlJywgcGFzc3dvcmQ6ICdwYXNzd29yZCd9OwotICAgICAgICAgICAgICAgIGNvbnN0IHRyaWdn ZXJhYmxlID0gbmV3IEJ1aWxkYm90VHJpZ2dlcmFibGUoY29uZmlnLCBUZXN0U2VydmVyLnJlbW90 ZUFQSSgpLCBNb2NrUmVtb3RlQVBJLCBzbGF2ZUluZm8sIGxvZ2dlcik7CisgICAgICAgICAgICAg ICAgdHJpZ2dlcmFibGUgPSBuZXcgQnVpbGRib3RUcmlnZ2VyYWJsZShjb25maWcsIFRlc3RTZXJ2 ZXIucmVtb3RlQVBJKCksIE1vY2tSZW1vdGVBUEksIHNsYXZlSW5mbywgbG9nZ2VyKTsKICAgICAg ICAgICAgICAgICBzeW5jUHJvbWlzZSA9IHRyaWdnZXJhYmxlLnN5bmNPbmNlKCk7CiAgICAgICAg ICAgICAgICAgcmV0dXJuIE1vY2tSZW1vdGVBUEkud2FpdEZvclJlcXVlc3QoKTsKICAgICAgICAg ICAgIH0pLnRoZW4oKCkgPT4gewotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVt b3RlQVBJLnJlcXVlc3RzLmxlbmd0aCwgMSk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMF0ubWV0aG9kLCAnR0VUJyk7Ci0gICAgICAgICAgICAg ICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMF0udXJsLCAnL2pzb24vYnVp bGRlcnMvc29tZS1idWlsZGVyLTEvcGVuZGluZ0J1aWxkcycpOwotICAgICAgICAgICAgICAgIE1v Y2tSZW1vdGVBUEkucmVxdWVzdHNbMF0ucmVzb2x2ZShbTW9ja0RhdGEucGVuZGluZ0J1aWxkKHti dWlsZFJlcXVlc3RJZDogNzExfSldKTsKKyAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVx dWVzdHMubGVuZ3RoLCAxKTsKKyAgICAgICAgICAgICAgICBhc3NlcnRSZXF1ZXN0QW5kUmVzb2x2 ZShyZXF1ZXN0c1swXSwgJ0dFVCcsICcvanNvbi9idWlsZGVycy9zb21lLWJ1aWxkZXItMS9wZW5k aW5nQnVpbGRzJywgW10pOwogICAgICAgICAgICAgICAgIHJldHVybiBNb2NrUmVtb3RlQVBJLndh aXRGb3JSZXF1ZXN0KCk7CiAgICAgICAgICAgICB9KS50aGVuKCgpID0+IHsKLSAgICAgICAgICAg ICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQSS5yZXF1ZXN0cy5sZW5ndGgsIDIpOwotICAg ICAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJlcXVlc3RzWzFdLm1ldGhv ZCwgJ0dFVCcpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJl cXVlc3RzWzFdLnVybCwgJy9qc29uL2J1aWxkZXJzL3NvbWUtYnVpbGRlci0xL2J1aWxkcy8/c2Vs ZWN0PS0xJnNlbGVjdD0tMicpOwotICAgICAgICAgICAgICAgIE1vY2tSZW1vdGVBUEkucmVxdWVz dHNbMV0ucmVzb2x2ZSh7Wy0xXTogTW9ja0RhdGEucnVubmluZ0J1aWxkKHtidWlsZFJlcXVlc3RJ ZDogNzAwfSksIFstMl06IE1vY2tEYXRhLmZpbmlzaGVkQnVpbGQoe2J1aWxkUmVxdWVzdElkOiA3 MTB9KX0pOworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDIp OworICAgICAgICAgICAgICAgIGFzc2VydFJlcXVlc3RBbmRSZXNvbHZlKHJlcXVlc3RzWzFdLCAn R0VUJywgJy9qc29uL2J1aWxkZXJzL3NvbWUtYnVpbGRlci0xL2J1aWxkcy8/c2VsZWN0PS0xJnNl bGVjdD0tMicsCisgICAgICAgICAgICAgICAgICAgIHtbLTFdOiBNb2NrRGF0YS5ydW5uaW5nQnVp bGQoe2J1aWxkUmVxdWVzdElkOiA3MDB9KSwgWy0yXTogTW9ja0RhdGEuZmluaXNoZWRCdWlsZCh7 YnVpbGRSZXF1ZXN0SWQ6IDcxMH0pfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIE1vY2tSZW1v dGVBUEkud2FpdEZvclJlcXVlc3QoKTsKICAgICAgICAgICAgIH0pLnRoZW4oKCkgPT4gewotICAg ICAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJlcXVlc3RzLmxlbmd0aCwg Myk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNb Ml0ubWV0aG9kLCAnR0VUJyk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1v dGVBUEkucmVxdWVzdHNbMl0udXJsLCAnL2pzb24vYnVpbGRlcnMvc29tZS1idWlsZGVyLTEvcGVu ZGluZ0J1aWxkcycpOwotICAgICAgICAgICAgICAgIE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMl0u cmVzb2x2ZShbTW9ja0RhdGEucGVuZGluZ0J1aWxkKHtidWlsZFJlcXVlc3RJZDogNzAxfSldKTsK KyAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCAzKTsKKyAgICAg ICAgICAgICAgICBhc3NlcnRSZXF1ZXN0QW5kUmVzb2x2ZShyZXF1ZXN0c1syXSwgJ1BPU1QnLCAn L2J1aWxkZXJzL3NvbWUtYnVpbGRlci0xL2ZvcmNlJyk7CisgICAgICAgICAgICAgICAgYXNzZXJ0 LmRlZXBFcXVhbChyZXF1ZXN0c1syXS5kYXRhLCB7J3drJzogJzE5MjczNicsICdvcyc6ICcxMC4x MSAxNUEyODQnLCAnYnVpbGQtcmVxdWVzdC1pZCc6ICc3MDEnfSk7CiAgICAgICAgICAgICAgICAg cmV0dXJuIE1vY2tSZW1vdGVBUEkud2FpdEZvclJlcXVlc3QoKTsKICAgICAgICAgICAgIH0pLnRo ZW4oKCkgPT4gewotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJl cXVlc3RzLmxlbmd0aCwgNCk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1v dGVBUEkucmVxdWVzdHNbM10ubWV0aG9kLCAnR0VUJyk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0 LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbM10udXJsLCAnL2pzb24vYnVpbGRlcnMvc29t ZS1idWlsZGVyLTEvYnVpbGRzLz9zZWxlY3Q9LTEmc2VsZWN0PS0yJyk7Ci0gICAgICAgICAgICAg ICAgTW9ja1JlbW90ZUFQSS5yZXF1ZXN0c1szXS5yZXNvbHZlKHtbLTFdOiBNb2NrRGF0YS5ydW5u aW5nQnVpbGQoe2J1aWxkUmVxdWVzdElkOiA3MDB9KSwgWy0yXTogTW9ja0RhdGEuZmluaXNoZWRC dWlsZCh7YnVpbGRSZXF1ZXN0SWQ6IDcxMH0pfSk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVx dWFsKHJlcXVlc3RzLmxlbmd0aCwgNCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0UmVxdWVzdEFu ZFJlc29sdmUocmVxdWVzdHNbM10sICdHRVQnLCAnL2pzb24vYnVpbGRlcnMvc29tZS1idWlsZGVy LTEvcGVuZGluZ0J1aWxkcycsCisgICAgICAgICAgICAgICAgICAgIFtNb2NrRGF0YS5wZW5kaW5n QnVpbGQoe2J1aWxkUmVxdWVzdElkOiA3MDF9KV0pOworICAgICAgICAgICAgICAgIHJldHVybiBN b2NrUmVtb3RlQVBJLndhaXRGb3JSZXF1ZXN0KCk7CisgICAgICAgICAgICB9KS50aGVuKCgpID0+ IHsKKyAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCA1KTsKKyAg ICAgICAgICAgICAgICBhc3NlcnRSZXF1ZXN0QW5kUmVzb2x2ZShyZXF1ZXN0c1s0XSwgJ0dFVCcs ICcvanNvbi9idWlsZGVycy9zb21lLWJ1aWxkZXItMS9idWlsZHMvP3NlbGVjdD0tMSZzZWxlY3Q9 LTInLAorICAgICAgICAgICAgICAgICAgICB7Wy0xXTogTW9ja0RhdGEucnVubmluZ0J1aWxkKHti dWlsZFJlcXVlc3RJZDogNzAwfSksIFstMl06IE1vY2tEYXRhLmZpbmlzaGVkQnVpbGQoe2J1aWxk UmVxdWVzdElkOiA3MTB9KX0pOwogICAgICAgICAgICAgICAgIHJldHVybiBzeW5jUHJvbWlzZTsK ICAgICAgICAgICAgIH0pLnRoZW4oKCkgPT4gewotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVh bChCdWlsZFJlcXVlc3QuYWxsKCkubGVuZ3RoLCA4KTsKLSAgICAgICAgICAgICAgICBhc3NlcnQu ZXF1YWwoQnVpbGRSZXF1ZXN0LmZpbmRCeUlkKDcwMCkuc3RhdHVzKCksICdjb21wbGV0ZWQnKTsK LSAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmZpbmRCeUlkKDcwMCku c3RhdHVzVXJsKCksIG51bGwpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJl cXVlc3QuZmluZEJ5SWQoNzAxKS5zdGF0dXMoKSwgJ3BlbmRpbmcnKTsKLSAgICAgICAgICAgICAg ICBhc3NlcnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmZpbmRCeUlkKDcwMSkuc3RhdHVzVXJsKCksIG51 bGwpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQo NzAyKS5zdGF0dXMoKSwgJ3BlbmRpbmcnKTsKLSAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwo QnVpbGRSZXF1ZXN0LmZpbmRCeUlkKDcwMikuc3RhdHVzVXJsKCksIG51bGwpOwotICAgICAgICAg ICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzAzKS5zdGF0dXMoKSwg J3BlbmRpbmcnKTsKLSAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmZp bmRCeUlkKDcwMykuc3RhdHVzVXJsKCksIG51bGwpOwotICAgICAgICAgICAgICAgIGFzc2VydC5l cXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzEwKS5zdGF0dXMoKSwgJ2NvbXBsZXRlZCcpOwot ICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzEwKS5z dGF0dXNVcmwoKSwgbnVsbCk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVx dWVzdC5maW5kQnlJZCg3MTEpLnN0YXR1cygpLCAncGVuZGluZycpOwotICAgICAgICAgICAgICAg IGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzExKS5zdGF0dXNVcmwoKSwgbnVs bCk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3 MTIpLnN0YXR1cygpLCAncGVuZGluZycpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChC dWlsZFJlcXVlc3QuZmluZEJ5SWQoNzEyKS5zdGF0dXNVcmwoKSwgbnVsbCk7Ci0gICAgICAgICAg ICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3MTMpLnN0YXR1cygpLCAn cGVuZGluZycpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmlu ZEJ5SWQoNzEzKS5zdGF0dXNVcmwoKSwgbnVsbCk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIEJ1 aWxkUmVxdWVzdC5mZXRjaEZvclRyaWdnZXJhYmxlKE1vY2tEYXRhLm1vY2tUZXN0U3luY0NvbmZp Z1dpdGhUd29CdWlsZGVycygpLnRyaWdnZXJhYmxlTmFtZSk7CisgICAgICAgICAgICAgICAgc3lu Y1Byb21pc2UgPSB0cmlnZ2VyYWJsZS5zeW5jT25jZSgpOworICAgICAgICAgICAgICAgIHJldHVy biBNb2NrUmVtb3RlQVBJLndhaXRGb3JSZXF1ZXN0KCk7CiAgICAgICAgICAgICB9KS50aGVuKCgp ID0+IHsKLSAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmFsbCgpLmxl bmd0aCwgOCk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5k QnlJZCg3MDApLnN0YXR1cygpLCAnY29tcGxldGVkJyk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0 LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3MDApLnN0YXR1c1VybCgpLCAnaHR0cDovL2J1 aWxkLndlYmtpdC5vcmcvYnVpbGRlcnMvc29tZS1idWlsZGVyLTEvYnVpbGRzLzEyNCcpOwotICAg ICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzAxKS5zdGF0 dXMoKSwgJ3NjaGVkdWxlZCcpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJl cXVlc3QuZmluZEJ5SWQoNzAxKS5zdGF0dXNVcmwoKSwgJ2h0dHA6Ly9idWlsZC53ZWJraXQub3Jn L2J1aWxkZXJzL3NvbWUtYnVpbGRlci0xLycpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVh bChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzAyKS5zdGF0dXMoKSwgJ3BlbmRpbmcnKTsKLSAgICAg ICAgICAgICAgICBhc3NlcnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmZpbmRCeUlkKDcwMikuc3RhdHVz VXJsKCksIG51bGwpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3Qu ZmluZEJ5SWQoNzAzKS5zdGF0dXMoKSwgJ3BlbmRpbmcnKTsKLSAgICAgICAgICAgICAgICBhc3Nl cnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmZpbmRCeUlkKDcwMykuc3RhdHVzVXJsKCksIG51bGwpOwot ICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzEwKS5z dGF0dXMoKSwgJ2NvbXBsZXRlZCcpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWls ZFJlcXVlc3QuZmluZEJ5SWQoNzEwKS5zdGF0dXNVcmwoKSwgJ2h0dHA6Ly9idWlsZC53ZWJraXQu b3JnL2J1aWxkZXJzL3NvbWUtYnVpbGRlci0xL2J1aWxkcy8xMjMnKTsKLSAgICAgICAgICAgICAg ICBhc3NlcnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmZpbmRCeUlkKDcxMSkuc3RhdHVzKCksICdwZW5k aW5nJyk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJ ZCg3MTEpLnN0YXR1c1VybCgpLCBudWxsKTsKLSAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwo QnVpbGRSZXF1ZXN0LmZpbmRCeUlkKDcxMikuc3RhdHVzKCksICdwZW5kaW5nJyk7Ci0gICAgICAg ICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3MTIpLnN0YXR1c1Vy bCgpLCBudWxsKTsKLSAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmZp bmRCeUlkKDcxMykuc3RhdHVzKCksICdwZW5kaW5nJyk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0 LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3MTMpLnN0YXR1c1VybCgpLCBudWxsKTsKKyAg ICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCA2KTsKKyAgICAgICAg ICAgICAgICBhc3NlcnRSZXF1ZXN0QW5kUmVzb2x2ZShyZXF1ZXN0c1s1XSwgJ0dFVCcsICcvanNv bi9idWlsZGVycy9zb21lLWJ1aWxkZXItMS9wZW5kaW5nQnVpbGRzJywgW10pOworICAgICAgICAg ICAgICAgIHJldHVybiBNb2NrUmVtb3RlQVBJLndhaXRGb3JSZXF1ZXN0KCk7CisgICAgICAgICAg ICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHMu bGVuZ3RoLCA3KTsKKyAgICAgICAgICAgICAgICBhc3NlcnRSZXF1ZXN0QW5kUmVzb2x2ZShyZXF1 ZXN0c1s2XSwgJ0dFVCcsICcvanNvbi9idWlsZGVycy9zb21lLWJ1aWxkZXItMS9idWlsZHMvP3Nl bGVjdD0tMSZzZWxlY3Q9LTInLAorICAgICAgICAgICAgICAgICAgICB7Wy0xXTogTW9ja0RhdGEu cnVubmluZ0J1aWxkKHtidWlsZFJlcXVlc3RJZDogNzAxfSksIFstMl06IE1vY2tEYXRhLnJ1bm5p bmdCdWlsZCh7YnVpbGRSZXF1ZXN0SWQ6IDcwMH0pfSk7CisgICAgICAgICAgICAgICAgcmV0dXJu IE1vY2tSZW1vdGVBUEkud2FpdEZvclJlcXVlc3QoKTsKKyAgICAgICAgICAgIH0pLnRoZW4oKCkg PT4geworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDgpOwor ICAgICAgICAgICAgICAgIGFzc2VydFJlcXVlc3RBbmRSZXNvbHZlKHJlcXVlc3RzWzddLCAnR0VU JywgJy9qc29uL2J1aWxkZXJzL3NvbWUtYnVpbGRlci0xL3BlbmRpbmdCdWlsZHMnLCBbXSk7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIE1vY2tSZW1vdGVBUEkud2FpdEZvclJlcXVlc3QoKTsKKyAg ICAgICAgICAgIH0pLnRoZW4oKCkgPT4geworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChy ZXF1ZXN0cy5sZW5ndGgsIDkpOworICAgICAgICAgICAgICAgIGFzc2VydFJlcXVlc3RBbmRSZXNv bHZlKHJlcXVlc3RzWzhdLCAnR0VUJywgJy9qc29uL2J1aWxkZXJzL3NvbWUtYnVpbGRlci0xL2J1 aWxkcy8/c2VsZWN0PS0xJnNlbGVjdD0tMicsCisgICAgICAgICAgICAgICAgICAgIHtbLTFdOiBN b2NrRGF0YS5ydW5uaW5nQnVpbGQoe2J1aWxkUmVxdWVzdElkOiA3MDF9KSwgWy0yXTogTW9ja0Rh dGEucnVubmluZ0J1aWxkKHtidWlsZFJlcXVlc3RJZDogNzAwfSl9KTsKKyAgICAgICAgICAgICAg ICByZXR1cm4gc3luY1Byb21pc2U7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSk7CiAKZGlm ZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9qcy9idWlsZGJvdC1zeW5j ZXIuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMvYnVpbGRib3Qtc3luY2Vy LmpzCmluZGV4IDdhYmIwYzk5ZTdmMDAzNGMzNTUzNWI3MDM5NzZmMGZlOGJmNThmMWYuLjJkODNh NjliZDM1ZTVjNDI3NGFmMTgzNWZhMTU1NzE2ZTg5YmMzY2YgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy90b29scy9qcy9idWlsZGJvdC1zeW5jZXIuanMKKysrIGIvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2J1aWxkYm90LXN5bmNlci5qcwpAQCAtMTI0LDcg KzEyNCwxMyBAQCBjbGFzcyBCdWlsZGJvdFN5bmNlciB7CiAgICAgICAgIGxldCBoYXNQZW5kaW5n QnVpbGRzV2l0aG91dFNsYXZlTmFtZVNwZWNpZmllZCA9IGZhbHNlOwogICAgICAgICBsZXQgdXNl ZFNsYXZlcyA9IG5ldyBTZXQ7CiAgICAgICAgIGZvciAobGV0IGVudHJ5IG9mIHRoaXMuX2VudHJ5 TGlzdCkgewotICAgICAgICAgICAgaWYgKGVudHJ5LmlzUGVuZGluZygpKSB7CisgICAgICAgICAg ICBsZXQgZW50cnlQcmV2ZW50c05ld1JlcXVlc3QgPSBlbnRyeS5pc1BlbmRpbmcoKTsKKyAgICAg ICAgICAgIGlmIChlbnRyeS5pc0luUHJvZ3Jlc3MoKSkgeworICAgICAgICAgICAgICAgIGNvbnN0 IHJlcXVlc3RJblByb2dyZXNzID0gQnVpbGRSZXF1ZXN0LmZpbmRCeUlkKGVudHJ5LmJ1aWxkUmVx dWVzdElkKCkpOworICAgICAgICAgICAgICAgIGlmICghcmVxdWVzdEluUHJvZ3Jlc3MgfHwgcmVx dWVzdEluUHJvZ3Jlc3MudGVzdEdyb3VwSWQoKSAhPSBuZXdSZXF1ZXN0LnRlc3RHcm91cElkKCkp CisgICAgICAgICAgICAgICAgICAgIGVudHJ5UHJldmVudHNOZXdSZXF1ZXN0ID0gdHJ1ZTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChlbnRyeVByZXZlbnRzTmV3UmVxdWVzdCkgewog ICAgICAgICAgICAgICAgIGlmICghZW50cnkuc2xhdmVOYW1lKCkpCiAgICAgICAgICAgICAgICAg ICAgIGhhc1BlbmRpbmdCdWlsZHNXaXRob3V0U2xhdmVOYW1lU3BlY2lmaWVkID0gdHJ1ZTsKICAg ICAgICAgICAgICAgICB1c2VkU2xhdmVzLmFkZChlbnRyeS5zbGF2ZU5hbWUoKSk7Cg==