219016 2020-11-16 18:47:17 -0800 BuildbotTriggerable should not process a completed build request from a completed test group. 2020-11-16 20:33:50 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu dewei_zhu rniwa oldest_to_newest 1708081 0 dewei_zhu 2020-11-16 18:47:17 -0800 BuildBotTriggerable should not process a completed build request from a completed test group. 1708084 1 414298 dewei_zhu 2020-11-16 19:04:11 -0800 Created attachment 414298 Patch 1708098 2 414298 rniwa 2020-11-16 19:30:19 -0800 Comment on attachment 414298 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414298&action=review > Websites/perf.webkit.org/ChangeLog:9 > + BuildBotTriggerable._pullBuildbotOnAllSyncers assumes BuildRequest.all() retuns all build requests from triggerables. > + And it relies on BuildRequest.findById to filter out buildbot build entries and corresponding build requests from a This explanation is rather misleading. The issue here isn't really that _pullBuildbotOnAllSyncers assumes that but it's rather that it relies on buildReqeustsByGroup to contain all build requests found by BuildRequest.findById. > Websites/perf.webkit.org/tools/js/buildbot-triggerable.js:182 > + if (!info) > + continue; We should probably assert here that in this case, request's test group had finished running. 1708109 3 dewei_zhu 2020-11-16 20:33:50 -0800 Landed in r269892. 414298 2020-11-16 19:04:11 -0800 2020-11-16 19:30:29 -0800 Patch bug-219016-20201116190410.patch text/plain 8715 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5ODg3CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA0OTNiNGUxYzU3MDAzMDUyNGZjYzE3NTYyYmYzMGIwMzgwMzFlNTJhLi5jYmM0OWE4MzQ2 MjA5MzQzYzg1YTIwYmViYzBlMDVjYmViZmEzN2Y1IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMC0xMS0xNiAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBCdWlsZGJvdFRyaWdnZXJhYmxlIHNob3VsZCBub3QgcHJv Y2VzcyBhIGNvbXBsZXRlZCBidWlsZCByZXF1ZXN0IGZyb20gYSBjb21wbGV0ZWQgdGVzdCBncm91 cC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTAx NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1aWxk Qm90VHJpZ2dlcmFibGUuX3B1bGxCdWlsZGJvdE9uQWxsU3luY2VycyBhc3N1bWVzIEJ1aWxkUmVx dWVzdC5hbGwoKSByZXR1bnMgYWxsIGJ1aWxkIHJlcXVlc3RzIGZyb20gdHJpZ2dlcmFibGVzLgor ICAgICAgICBBbmQgaXQgcmVsaWVzIG9uIEJ1aWxkUmVxdWVzdC5maW5kQnlJZCB0byBmaWx0ZXIg b3V0IGJ1aWxkYm90IGJ1aWxkIGVudHJpZXMgYW5kIGNvcnJlc3BvbmRpbmcgYnVpbGQgcmVxdWVz dHMgZnJvbSBhCisgICAgICAgIGNvbXBsZXRlZCB0ZXN0IGdyb3VwIHdoaWNoIGlzIG5vdCBpbmNs dWRlZCBpbiB0aGUgYnVpbGQgcmVxdWVzdHMgZnJvbSB0cmlnZ2VyYWJsZXMuCisgICAgICAgIEhv d2V2ZXIsIHNpbmNlIHJlLXVzZSByb290IGNoYW5nZSBpcyBsYW5kZWQsIGFib3ZlIGFzc3VtcHRp b24gaXMgbm8gbG9uZ2VyIHZhbGlkLiBCdWlsZFJlcXVlc3QuYWxsKCkgbWF5IGluY2x1ZGVzIGJ1 aWxkCisgICAgICAgIHJlcXVlc3RzIHVuZGVyIHNhbWUgYW5hbHlzaXMgdGFzay4gVGh1cywgYF9w dWxsQnVpbGRib3RPbkFsbFN5bmNlcnNgIHdpbGwgZmFpbCBkdWUgdG8gJ2luZm8nIGlzIHVuZGVm aW5lZC4KKworICAgICAgICAqIHNlcnZlci10ZXN0cy90b29scy1idWlsZGJvdC10cmlnZ2VyYWJs ZS10ZXN0cy5qczogQWRkZWQgYSB1bml0IHRlc3QuCisgICAgICAgICogdG9vbHMvanMvYnVpbGRi b3QtdHJpZ2dlcmFibGUuanM6CisgICAgICAgIChCdWlsZGJvdFRyaWdnZXJhYmxlLnByb3RvdHlw ZS5fcHVsbEJ1aWxkYm90T25BbGxTeW5jZXJzKTogQWRkZWQgbG9naWMgdG8gc3RvcCBwcm9jZXNz aW5nIHRoZSBidWlsZCByZXF1ZXN0IGlmIGl0J3Mgbm90CisgICAgICAgIGZyb20gaW5jb21wbGV0 ZSBidWlsZCByZXF1ZXN0cyB1bmRlciBhIHRyaWdnZXJhYmxlLgorCiAyMDIwLTEwLTMwICBEZXdl aSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgogCiAgICAgICAgIFBlcmZvcm1hbmNlIGRhc2hi b2FyZCBzaG91bGQgYXZvaWQgYnVpbGRpbmcgc2FtZSBjb25maWd1cmF0aW9uIHVuZGVyIG9uZSBh bmFseXNpcyB0YXNrLgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZl ci10ZXN0cy90b29scy1idWlsZGJvdC10cmlnZ2VyYWJsZS10ZXN0cy5qcyBiL1dlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMtYnVpbGRib3QtdHJpZ2dlcmFibGUtdGVz dHMuanMKaW5kZXggMTA4MmE2ODJiMjJiNGRhNGNjMmQyMzk3MjEwOTNkOWU3N2Y1OWZkNS4uNmMz ZWMyZmM4NTQyZWJjOTdjNTc5Yzk4ZjEyMGQwNTY3YTI1NWUyZiAxMDA2NDQKLS0tIGEvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy90b29scy1idWlsZGJvdC10cmlnZ2VyYWJs ZS10ZXN0cy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Rv b2xzLWJ1aWxkYm90LXRyaWdnZXJhYmxlLXRlc3RzLmpzCkBAIC05NDcsNiArOTQ3LDg1IEBAIGRl c2NyaWJlKCdCdWlsZGJvdFRyaWdnZXJhYmxlJywgZnVuY3Rpb24gKCkgewogICAgICAgICAgICAg fSk7CiAgICAgICAgIH0pOwogCisgICAgICAgIGl0KCdzaG91bGQgc2tpcCB1cGRhdGluZyBhIGNv bXBsZXRlZCBidWlsZCByZXF1ZXN0IHdob3NlIHRlc3QgZ3JvdXAgaGFzIGNvbXBsZXRlZCBhbmQg bm90IGxpc3RlZCBpbiBhIHRyaWdnZXJhYmxlJywgYXN5bmMgKCkgPT4geworICAgICAgICAgICAg YXdhaXQgTW9ja0RhdGEuYWRkTW9ja0J1aWxkUmVxdWVzdHNXaXRoUm9vdHMoVGVzdFNlcnZlci5k YXRhYmFzZSgpLCBbJ2NvbXBsZXRlZCcsICdjb21wbGV0ZWQnLCAnY29tcGxldGVkJywgJ2NvbXBs ZXRlZCcsICdwZW5kaW5nJywgJ3BlbmRpbmcnLCAncGVuZGluZycsICdwZW5kaW5nJ10pOworICAg ICAgICAgICAgYXdhaXQgTWFuaWZlc3QuZmV0Y2goKTsKKyAgICAgICAgICAgIGNvbnN0IGNvbmZp ZyA9IE1vY2tEYXRhLm1vY2tUZXN0U3luY0NvbmZpZ1dpdGhQYXRjaEFjY2VwdGluZ0J1aWxkZXIo KTsKKyAgICAgICAgICAgIGNvbnN0IGxvZ2dlciA9IG5ldyBNb2NrTG9nZ2VyOworICAgICAgICAg ICAgY29uc3Qgc2xhdmVJbmZvID0ge25hbWU6ICdzeW5jLXNsYXZlJywgcGFzc3dvcmQ6ICdwYXNz d29yZCd9OworICAgICAgICAgICAgY29uc3QgdHJpZ2dlcmFibGUgPSBuZXcgQnVpbGRib3RUcmln Z2VyYWJsZShjb25maWcsIFRlc3RTZXJ2ZXIucmVtb3RlQVBJKCksIE1vY2tSZW1vdGVBUEksIHNs YXZlSW5mbywgbG9nZ2VyKTsKKyAgICAgICAgICAgIGNvbnN0IHN5bmNQcm9taXNlID0gdHJpZ2dl cmFibGUuaW5pdFN5bmNlcnMoKS50aGVuKCgpID0+IHRyaWdnZXJhYmxlLnN5bmNPbmNlKCkpOwor ICAgICAgICAgICAgYXNzZXJ0UmVxdWVzdEFuZFJlc29sdmUoTW9ja1JlbW90ZUFQSS5yZXF1ZXN0 c1swXSwgJ0dFVCcsIE1vY2tEYXRhLmJ1aWxkYm90QnVpbGRlcnNVUkwoKSwgTW9ja0RhdGEubW9j a0J1aWxkYm90QnVpbGRlcnMoKSk7CisgICAgICAgICAgICBNb2NrUmVtb3RlQVBJLnJlc2V0KCk7 CisgICAgICAgICAgICBhd2FpdCBNb2NrUmVtb3RlQVBJLndhaXRGb3JSZXF1ZXN0KCk7CisKKyAg ICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuYWxsKCkubGVuZ3RoLCA0KTsKKyAg ICAgICAgICAgIGxldCBidWlsZFJlcXVlc3QgPSBCdWlsZFJlcXVlc3QuZmluZEJ5SWQoOTAwKTsK KyAgICAgICAgICAgIGFzc2VydC5lcXVhbChidWlsZFJlcXVlc3Quc3RhdHVzKCksICdwZW5kaW5n Jyk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoYnVpbGRSZXF1ZXN0LnN0YXR1c1VybCgpLCBu dWxsKTsKKworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHMu bGVuZ3RoLCAzKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJlcXVl c3RzWzBdLm1ldGhvZCwgJ0dFVCcpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1v dGVBUEkucmVxdWVzdHNbMF0udXJsLCBNb2NrRGF0YS5wZW5kaW5nQnVpbGRzVXJsKCdzb21lIHRl c3RlcicpKTsKKyAgICAgICAgICAgIE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMF0ucmVzb2x2ZSh7 fSk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQSS5yZXF1ZXN0c1sxXS5t ZXRob2QsICdHRVQnKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJl cXVlc3RzWzFdLnVybCwgTW9ja0RhdGEucGVuZGluZ0J1aWxkc1VybCgnc29tZS1idWlsZGVyLTEn KSk7CisgICAgICAgICAgICBNb2NrUmVtb3RlQVBJLnJlcXVlc3RzWzFdLnJlc29sdmUoe30pOwor ICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMl0ubWV0aG9k LCAnR0VUJyk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQSS5yZXF1ZXN0 c1syXS51cmwsIE1vY2tEYXRhLnBlbmRpbmdCdWlsZHNVcmwoJ3NvbWUgYnVpbGRlciAyJykpOwor ICAgICAgICAgICAgTW9ja1JlbW90ZUFQSS5yZXF1ZXN0c1syXS5yZXNvbHZlKHt9KTsKKyAgICAg ICAgICAgIE1vY2tSZW1vdGVBUEkucmVzZXQoKTsKKyAgICAgICAgICAgIGF3YWl0IE1vY2tSZW1v dGVBUEkud2FpdEZvclJlcXVlc3QoKTsKKworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tS ZW1vdGVBUEkucmVxdWVzdHMubGVuZ3RoLCAzKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChN b2NrUmVtb3RlQVBJLnJlcXVlc3RzWzBdLm1ldGhvZCwgJ0dFVCcpOworICAgICAgICAgICAgYXNz ZXJ0LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMF0udXJsLCBNb2NrRGF0YS5yZWNlbnRC dWlsZHNVcmwoJ3NvbWUgdGVzdGVyJywgMikpOworICAgICAgICAgICAgTW9ja1JlbW90ZUFQSS5y ZXF1ZXN0c1swXS5yZXNvbHZlKHt9KTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVt b3RlQVBJLnJlcXVlc3RzWzFdLm1ldGhvZCwgJ0dFVCcpOworICAgICAgICAgICAgYXNzZXJ0LmVx dWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMV0udXJsLCBNb2NrRGF0YS5yZWNlbnRCdWlsZHNV cmwoJ3NvbWUtYnVpbGRlci0xJywgMikpOworICAgICAgICAgICAgTW9ja1JlbW90ZUFQSS5yZXF1 ZXN0c1sxXS5yZXNvbHZlKHsnYnVpbGRzJzogW01vY2tEYXRhLmZpbmlzaGVkQnVpbGREYXRhKHti dWlsZFJlcXVlc3RJZDogODAxfSksIE1vY2tEYXRhLmZpbmlzaGVkQnVpbGREYXRhKHtidWlsZFJl cXVlc3RJZDogODAwfSldfSk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQ SS5yZXF1ZXN0c1syXS5tZXRob2QsICdHRVQnKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChN b2NrUmVtb3RlQVBJLnJlcXVlc3RzWzJdLnVybCwgTW9ja0RhdGEucmVjZW50QnVpbGRzVXJsKCdz b21lIGJ1aWxkZXIgMicsIDIpKTsKKyAgICAgICAgICAgIE1vY2tSZW1vdGVBUEkucmVxdWVzdHNb Ml0ucmVzb2x2ZSh7fSk7CisgICAgICAgICAgICBNb2NrUmVtb3RlQVBJLnJlc2V0KCk7CisgICAg ICAgICAgICBhd2FpdCBNb2NrUmVtb3RlQVBJLndhaXRGb3JSZXF1ZXN0KCk7CisKKyAgICAgICAg ICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJlcXVlc3RzLmxlbmd0aCwgMyk7CisgICAg ICAgICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQSS5yZXF1ZXN0c1swXS5tZXRob2QsICdH RVQnKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJlcXVlc3RzWzBd LnVybCwgTW9ja0RhdGEucGVuZGluZ0J1aWxkc1VybCgnc29tZSB0ZXN0ZXInKSk7CisgICAgICAg ICAgICBNb2NrUmVtb3RlQVBJLnJlcXVlc3RzWzBdLnJlc29sdmUoe30pOworICAgICAgICAgICAg YXNzZXJ0LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMV0ubWV0aG9kLCAnR0VUJyk7Cisg ICAgICAgICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQSS5yZXF1ZXN0c1sxXS51cmwsIE1v Y2tEYXRhLnBlbmRpbmdCdWlsZHNVcmwoJ3NvbWUtYnVpbGRlci0xJykpOworICAgICAgICAgICAg TW9ja1JlbW90ZUFQSS5yZXF1ZXN0c1sxXS5yZXNvbHZlKHt9KTsKKyAgICAgICAgICAgIGFzc2Vy dC5lcXVhbChNb2NrUmVtb3RlQVBJLnJlcXVlc3RzWzJdLm1ldGhvZCwgJ0dFVCcpOworICAgICAg ICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMl0udXJsLCBNb2NrRGF0 YS5wZW5kaW5nQnVpbGRzVXJsKCdzb21lIGJ1aWxkZXIgMicpKTsKKyAgICAgICAgICAgIE1vY2tS ZW1vdGVBUEkucmVxdWVzdHNbMl0ucmVzb2x2ZSh7fSk7CisgICAgICAgICAgICBNb2NrUmVtb3Rl QVBJLnJlc2V0KCk7CisgICAgICAgICAgICBhd2FpdCBNb2NrUmVtb3RlQVBJLndhaXRGb3JSZXF1 ZXN0KCk7CisKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJLnJlcXVlc3Rz Lmxlbmd0aCwgMyk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQSS5yZXF1 ZXN0c1swXS5tZXRob2QsICdHRVQnKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVt b3RlQVBJLnJlcXVlc3RzWzBdLnVybCwgTW9ja0RhdGEucmVjZW50QnVpbGRzVXJsKCdzb21lIHRl c3RlcicsIDIpKTsKKyAgICAgICAgICAgIE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMF0ucmVzb2x2 ZSh7fSk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQSS5yZXF1ZXN0c1sx XS5tZXRob2QsICdHRVQnKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChNb2NrUmVtb3RlQVBJ LnJlcXVlc3RzWzFdLnVybCwgTW9ja0RhdGEucmVjZW50QnVpbGRzVXJsKCdzb21lLWJ1aWxkZXIt MScsIDIpKTsKKyAgICAgICAgICAgIE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMV0ucmVzb2x2ZSh7 J2J1aWxkcyc6IFtNb2NrRGF0YS5maW5pc2hlZEJ1aWxkRGF0YSh7YnVpbGRSZXF1ZXN0SWQ6IDgw MX0pLCBNb2NrRGF0YS5maW5pc2hlZEJ1aWxkRGF0YSh7YnVpbGRSZXF1ZXN0SWQ6IDgwMH0pXX0p OworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKE1vY2tSZW1vdGVBUEkucmVxdWVzdHNbMl0ubWV0 aG9kLCAnR0VUJyk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoTW9ja1JlbW90ZUFQSS5yZXF1 ZXN0c1syXS51cmwsIE1vY2tEYXRhLnJlY2VudEJ1aWxkc1VybCgnc29tZSBidWlsZGVyIDInLCAy KSk7CisgICAgICAgICAgICBNb2NrUmVtb3RlQVBJLnJlcXVlc3RzWzJdLnJlc29sdmUoe30pOwor ICAgICAgICAgICAgTW9ja1JlbW90ZUFQSS5yZXNldCgpOworCisgICAgICAgICAgICBhd2FpdCBz eW5jUHJvbWlzZTsKKyAgICAgICAgICAgIGF3YWl0IEJ1aWxkUmVxdWVzdC5mZXRjaEZvclRyaWdn ZXJhYmxlKE1vY2tEYXRhLm1vY2tUZXN0U3luY0NvbmZpZ1dpdGhQYXRjaEFjY2VwdGluZ0J1aWxk ZXIoKS50cmlnZ2VyYWJsZU5hbWUpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVx dWVzdC5hbGwoKS5sZW5ndGgsIDgpOworICAgICAgICAgICAgYnVpbGRSZXF1ZXN0ID0gQnVpbGRS ZXF1ZXN0LmZpbmRCeUlkKDgwMCk7CisgICAgICAgICAgICBsZXQgYW5vdGhlckJ1aWxkUmVxdWVz dCA9IEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg5MDApOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KGJ1aWxkUmVxdWVzdC5zdGF0dXMoKSwgJ2NvbXBsZXRlZCcpOworICAgICAgICAgICAgYXNzZXJ0 LmVxdWFsKGFub3RoZXJCdWlsZFJlcXVlc3Quc3RhdHVzKCksICdjb21wbGV0ZWQnKTsKKyAgICAg ICAgICAgIGFzc2VydC5lcXVhbChidWlsZFJlcXVlc3Quc3RhdHVzVXJsKCksICdodHRwOi8vYnVp bGQud2Via2l0Lm9yZy9idWlkcy8xJyk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoYW5vdGhl ckJ1aWxkUmVxdWVzdC5zdGF0dXNVcmwoKSwgJ2h0dHA6Ly9idWlsZC53ZWJraXQub3JnL2J1aWRz LzEnKTsKKyAgICAgICAgfSk7CisKICAgICAgICAgaXQoJ3Nob3VsZCByZXVzZSB0aGUgcm9vdHMg ZnJvbSBhIGNvbXBsZXRlZCBidWlsZCByZXF1ZXN0IHdpdGggdGhlIHNhbWUgY29tbWl0IHNldCcs IGFzeW5jICgpID0+IHsKICAgICAgICAgICAgIGF3YWl0IE1vY2tEYXRhLmFkZE1vY2tCdWlsZFJl cXVlc3RzV2l0aFJvb3RzKFRlc3RTZXJ2ZXIuZGF0YWJhc2UoKSk7CiAgICAgICAgICAgICBhd2Fp dCBNYW5pZmVzdC5mZXRjaCgpOwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3Rvb2xzL2pzL2J1aWxkYm90LXRyaWdnZXJhYmxlLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3Rvb2xzL2pzL2J1aWxkYm90LXRyaWdnZXJhYmxlLmpzCmluZGV4IDIwZTRiNzRmNDYxOTBk NWQwNGE0Y2UyZGIyODE2NWQ1MzQ3MTkwYjYuLjE0MjUwY2YwYWJmOTYwMWRhMDAxMDFkMGVhY2Q2 YTA5ODA4NTZlMmUgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9q cy9idWlsZGJvdC10cmlnZ2VyYWJsZS5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv dG9vbHMvanMvYnVpbGRib3QtdHJpZ2dlcmFibGUuanMKQEAgLTE3Niw5ICsxNzYsMTMgQEAgY2xh c3MgQnVpbGRib3RUcmlnZ2VyYWJsZSB7CiAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHJlcXVl c3QgPSBCdWlsZFJlcXVlc3QuZmluZEJ5SWQoZW50cnkuYnVpbGRSZXF1ZXN0SWQoKSk7CiAgICAg ICAgICAgICAgICAgICAgIGlmICghcmVxdWVzdCkKICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotICAgICAgICAgICAgICAgICAgICBhc3NvY2lhdGVkUmVxdWVzdHMuYWRkKHJlcXVl c3QpOwogCiAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGluZm8gPSBidWlsZFJlcWV1c3RzQnlH cm91cC5nZXQocmVxdWVzdC50ZXN0R3JvdXBJZCgpKTsKKyAgICAgICAgICAgICAgICAgICAgaWYg KCFpbmZvKQorICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAg ICAgICAgICAgYXNzb2NpYXRlZFJlcXVlc3RzLmFkZChyZXF1ZXN0KTsKKwogICAgICAgICAgICAg ICAgICAgICBpZiAocmVxdWVzdC5pc0J1aWxkKCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAg IGFzc2VydCghaW5mby5idWlsZFN5bmNlciB8fCBpbmZvLmJ1aWxkU3luY2VyID09IHN5bmNlcik7 CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoZW50cnkuc2xhdmVOYW1lKCkpIHsK