136281 2014-08-26 22:48:26 -0700 build.webkit.org/dashboard: Poor performance when there are broken builds at initial load time 2014-08-26 23:59:06 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap commit-queue thorton timothy oldest_to_newest 1031587 0 ap 2014-08-26 22:48:26 -0700 For failing builds, the dashboard tries to figure out how long the build was broken. If it doesn't happen to have the data for an older passing build already loaded, it starts to load all historic results for this revision. This is extremely costly, as there is an HTTP request for each iteration. 1031588 1 237205 ap 2014-08-26 22:52:05 -0700 Created attachment 237205 proposed fix 1031590 2 ap 2014-08-26 22:58:16 -0700 Builders are all shamelessly green, so I couldn't test the patch now :) 1031594 3 237205 thorton 2014-08-26 23:07:00 -0700 Comment on attachment 237205 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=237205&action=review > Tools/ChangeLog:10 > + the iteration is already beaing loaded. s/beaing/being/ > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js:111 > + queue.loadMoreHistoricIterations(); historic (adj.): "famous or important in history, or potentially so" I think you want 'historical'. English is weird. 1031596 4 237208 ap 2014-08-26 23:17:59 -0700 Created attachment 237208 patch for landing Thanks! 1031605 5 237208 commit-queue 2014-08-26 23:59:04 -0700 Comment on attachment 237208 patch for landing Clearing flags on attachment: 237208 Committed r172998: <http://trac.webkit.org/changeset/172998> 1031606 6 commit-queue 2014-08-26 23:59:06 -0700 All reviewed patches have been landed. Closing bug. 237205 2014-08-26 22:52:05 -0700 2014-08-26 23:17:59 -0700 proposed fix DontLoadAll.txt text/plain 5794 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3Mjk5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDE0LTA4LTI2ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIGJ1aWxkLndlYmtpdC5vcmcvZGFzaGJvYXJkOiBQb29yIHBlcmZvcm1hbmNl IHdoZW4gdGhlcmUgYXJlIGJyb2tlbiBidWlsZHMgYXQgaW5pdGlhbCBsb2FkIHRpbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjI4MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvQnVpbGRib3RJdGVyYXRpb24uanM6CisgICAgICAgIFRyYWNrIGFuZCBleHBvc2Ugd2hldGhl ciB0aGUgaXRlcnRpb24gaXMgYmVpbmcgbG9hZGVkLiBNYWRlIHVwZGF0ZSgpIGEgbm8tb3AgaWYK KyAgICAgICAgdGhlIGl0ZXJhdGlvbiBpcyBhbHJlYWR5IGJlYWluZyBsb2FkZWQuCisKKyAgICAg ICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEJ1aWxkZXJRdWV1ZVZpZXcuanM6CisgICAgICAg IChCdWlsZGJvdEJ1aWxkZXJRdWV1ZVZpZXcucHJvdG90eXBlLnVwZGF0ZS5hcHBlbmRCdWlsZGVy UXVldWVTdGF0dXMpOiBJbnN0ZWFkIG9mCisgICAgICAgIGxvYWRpbmcgZXZlcnl0aGluZyBhdCBv bmNlLCBhc2sgdGhlIHF1ZXVlIHRvIGxvYWQgYSBsaXR0bGUgbW9yZS4gV2UgY2FuIGFsd2F5cyBy ZXBlYXQKKyAgICAgICAgaWYgd2Ugc3RpbGwgZG9uJ3QgaGF2ZSBlbm91Z2ggZGF0YS4KKworICAg ICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWUuanM6CisgICAgICAgIChCdWlsZGJv dFF1ZXVlLnByb3RvdHlwZS5sb2FkTW9yZUhpc3RvcmljSXRlcmF0aW9ucyk6IEFkZGVkIGEgZnVu Y3Rpb24gdGhhdCBsb2FkcworICAgICAgICAxMCBtb3JlIGl0ZXJhdGlvbnMgaW50ZWxsaWdlbnRs eS4KKwogMjAxNC0wOC0yNiAgTWF0dCBMaWxlayAgPG1ybEBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIFdlYktpdCBTUEkgdG8gY29udHJvbCB0aGUgbmF2aWdhdG9yLnN0YW5kYWxvbmUgcHJvcGVy dHkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90QnVpbGRlclF1ZXVlVmlldy5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEJ1aWxkZXJRdWV1 ZVZpZXcuanMJKHJldmlzaW9uIDE3Mjk0NikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxk Ym90QnVpbGRlclF1ZXVlVmlldy5qcwkod29ya2luZyBjb3B5KQpAQCAtMTA4LDkgKzEwOCw3IEBA IEJ1aWxkYm90QnVpbGRlclF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgICAg ICBpZiAoZmlyc3RSZWNlbnRVbnN1Y2Nlc3NmdWxJdGVyYXRpb24pIHsKICAgICAgICAgICAgICAg ICAgICAgLy8gV2UgaGF2ZSBhIGZhaWxlZCBpdGVyYXRpb24gYnV0IG5vIHN1Y2Nlc3NmdWwuIEl0 IG1pZ2h0IGJlIGZ1cnRoZXIgYmFjayBpbiB0aW1lLgotICAgICAgICAgICAgICAgICAgICAvLyBV cGRhdGUgYWxsIHRoZSBpdGVyYXRpb25zIHNvIHdlIGdldCBtb3JlIGhpc3RvcnkuCi0gICAgICAg ICAgICAgICAgICAgIC8vIEZJWE1FOiBJdCBjYW4gYmUgdmVyeSB0aW1lIGNvbnN1bWluZyB0byBs b2FkIGFsbCBpdGVyYXRpb25zLCB3ZSBzaG91bGQgbG9hZCBwcm9ncmVzc2l2ZWx5LgotICAgICAg ICAgICAgICAgICAgICBxdWV1ZS5pdGVyYXRpb25zLmZvckVhY2goZnVuY3Rpb24oaXRlcmF0aW9u KSB7IGl0ZXJhdGlvbi51cGRhdGUoKTsgfSk7CisgICAgICAgICAgICAgICAgICAgIHF1ZXVlLmxv YWRNb3JlSGlzdG9yaWNJdGVyYXRpb25zKCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgfQogICAgICAgICB9CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJh dGlvbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJh dGlvbi5qcwkocmV2aXNpb24gMTcyOTQ2KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3RJdGVyYXRpb24uanMJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcgQEAgQnVpbGRib3RJ dGVyYXRpb24gPSBmdW5jdGlvbihxdWV1ZSwgZGF0YQogICAgIHRoaXMuaWQgPSBkYXRhT3JJRDsK IAogICAgIHRoaXMubG9hZGVkID0gZmFsc2U7CisgICAgdGhpcy5pc0xvYWRpbmcgPSBmYWxzZTsK IAogICAgIHRoaXMub3BlblNvdXJjZVJldmlzaW9uID0gbnVsbDsKICAgICB0aGlzLmludGVybmFs UmV2aXNpb24gPSBudWxsOwpAQCAtMjk1LDcgKzI5NiwxMyBAQCBCdWlsZGJvdEl0ZXJhdGlvbi5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLnF1ZXVlLmJ1aWxkYm90Lm5lZWRzQXV0aGVu dGljYXRpb24gJiYgdGhpcy5xdWV1ZS5idWlsZGJvdC5hdXRoZW50aWNhdGlvblN0YXR1cyA9PT0g QnVpbGRib3QuQXV0aGVudGljYXRpb25TdGF0dXMuSW52YWxpZENyZWRlbnRpYWxzKQogICAgICAg ICAgICAgcmV0dXJuOwogCisgICAgICAgIGlmICh0aGlzLmlzTG9hZGluZykKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICB0aGlzLmlzTG9hZGluZyA9IHRydWU7CisKICAgICAgICAgSlNP Ti5sb2FkKHRoaXMucXVldWUuYmFzZVVSTCArICIvYnVpbGRzLyIgKyB0aGlzLmlkLCBmdW5jdGlv bihkYXRhKSB7CisgICAgICAgICAgICB0aGlzLmlzTG9hZGluZyA9IGZhbHNlOwogICAgICAgICAg ICAgdGhpcy5xdWV1ZS5idWlsZGJvdC5pc0F1dGhlbnRpY2F0ZWQgPSB0cnVlOwogICAgICAgICAg ICAgaWYgKCFkYXRhIHx8ICFkYXRhLnByb3BlcnRpZXMpCiAgICAgICAgICAgICAgICAgcmV0dXJu OwpAQCAtMzAzLDYgKzMxMCw3IEBAIEJ1aWxkYm90SXRlcmF0aW9uLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHRoaXMuX3VwZGF0ZVdpdGhEYXRhKGRhdGEpOwogICAgICAgICB9LmJpbmQodGhp cyksCiAgICAgICAgIGZ1bmN0aW9uKGRhdGEpIHsKKyAgICAgICAgICAgIHRoaXMuaXNMb2FkaW5n ID0gZmFsc2U7CiAgICAgICAgICAgICBpZiAoZGF0YS5lcnJvclR5cGUgPT09IEpTT04uTG9hZEVy cm9yICYmIGRhdGEuZXJyb3JIVFRQQ29kZSA9PT0gNDAxKSB7CiAgICAgICAgICAgICAgICAgdGhp cy5xdWV1ZS5idWlsZGJvdC5pc0F1dGhlbnRpY2F0ZWQgPSBmYWxzZTsKICAgICAgICAgICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhCdWlsZGJvdEl0ZXJhdGlvbi5FdmVudC5V bmF1dGhvcml6ZWRBY2Nlc3MpOwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RR dWV1ZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl LmpzCShyZXZpc2lvbiAxNzI5NDYpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1 ZXVlLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xNTIsNiArMTUyLDMyIEBAIEJ1aWxkYm90UXVldWUu cHJvdG90eXBlID0gewogICAgICAgICApOwogICAgIH0sCiAKKyAgICBsb2FkTW9yZUhpc3Rvcmlj SXRlcmF0aW9uczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIGluZGV4T2ZGaXJzdE5l d2x5TG9hZGluZ0l0ZXJhdGlvbjsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLml0 ZXJhdGlvbnMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIGlmIChpbmRleE9mRmlyc3ROZXds eUxvYWRpbmdJdGVyYXRpb24gIT09IHVuZGVmaW5lZCAmJiBpID49IGluZGV4T2ZGaXJzdE5ld2x5 TG9hZGluZ0l0ZXJhdGlvbiArIEJ1aWxkYm90UXVldWUuUmVjZW50SXRlcmF0aW9uc1RvTG9hZCkK KyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB2YXIgaXRlcmF0aW9uID0gdGhp cy5pdGVyYXRpb25zW2ldOworICAgICAgICAgICAgaWYgKCFpdGVyYXRpb24uZmluaXNoZWQpCisg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBpZiAoaXRlcmF0aW9uLmlzTG9h ZGluZykgeworICAgICAgICAgICAgICAgIC8vIENhbGxlciBsYWNrcyB2aXNpYmlsaXR5IGludG8g bG9hZGluZywgc28gaXQgaXMgbGlrZWx5IHRvIGNhbGwgdGhpcyBmdW5jdGlvbiB0b28gb2Z0ZW4u CisgICAgICAgICAgICAgICAgLy8gR2l2ZSBpdCBhIGNoYW5jZSB0byBhbmFseXplIGV2ZXJ5dGhp bmcgdGhhdCdzIGJlZW4gYWxyZWFkeSByZXF1ZXN0ZWQgZmlyc3QsIGFuZCB0aGVuIGl0IGNhbiBk ZWNpZGUgd2hldGhlciBpdCBuZWVkcyBtb3JlLgorICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChpdGVyYXRpb24ubG9hZGVkICYmIGluZGV4T2ZG aXJzdE5ld2x5TG9hZGluZ0l0ZXJhdGlvbiAhPT0gdW5kZWZpbmVkKSB7CisgICAgICAgICAgICAg ICAgLy8gVGhlcmUgd2FzIGEgZ2FwIGJldHdlZW4gbG9hZGVkIGl0ZXJhdGlvbnMsIHdoaWNoIHdl J3ZlIGNsb3NlZCBub3cuCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKCFpdGVyYXRpb24ubG9hZGVkKSB7CisgICAgICAgICAgICAgICAgaWYg KGluZGV4T2ZGaXJzdE5ld2x5TG9hZGluZ0l0ZXJhdGlvbiA9PT0gdW5kZWZpbmVkKQorICAgICAg ICAgICAgICAgICAgICBpbmRleE9mRmlyc3ROZXdseUxvYWRpbmdJdGVyYXRpb24gPSBpOworICAg ICAgICAgICAgICAgIGl0ZXJhdGlvbi51cGRhdGUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorICAgIH0sCisKICAgICB1cGRhdGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMu X2xvYWQodGhpcy5iYXNlVVJMLCBmdW5jdGlvbihkYXRhKSB7Cg== 237208 2014-08-26 23:17:59 -0700 2014-08-26 23:59:04 -0700 patch for landing DontLoadAll.txt text/plain 5795 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3Mjk5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDE0LTA4LTI2ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIGJ1aWxkLndlYmtpdC5vcmcvZGFzaGJvYXJkOiBQb29yIHBlcmZvcm1hbmNl IHdoZW4gdGhlcmUgYXJlIGJyb2tlbiBidWlsZHMgYXQgaW5pdGlhbCBsb2FkIHRpbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjI4MQorCisgICAg ICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9C dWlsZGJvdEl0ZXJhdGlvbi5qczoKKyAgICAgICAgVHJhY2sgYW5kIGV4cG9zZSB3aGV0aGVyIHRo ZSBpdGVydGlvbiBpcyBiZWluZyBsb2FkZWQuIE1hZGUgdXBkYXRlKCkgYSBuby1vcCBpZgorICAg ICAgICB0aGUgaXRlcmF0aW9uIGlzIGFscmVhZHkgYmVpbmcgbG9hZGVkLgorCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFz aGJvYXJkL1NjcmlwdHMvQnVpbGRib3RCdWlsZGVyUXVldWVWaWV3LmpzOgorICAgICAgICAoQnVp bGRib3RCdWlsZGVyUXVldWVWaWV3LnByb3RvdHlwZS51cGRhdGUuYXBwZW5kQnVpbGRlclF1ZXVl U3RhdHVzKTogSW5zdGVhZCBvZgorICAgICAgICBsb2FkaW5nIGV2ZXJ5dGhpbmcgYXQgb25jZSwg YXNrIHRoZSBxdWV1ZSB0byBsb2FkIGEgbGl0dGxlIG1vcmUuIFdlIGNhbiBhbHdheXMgcmVwZWF0 CisgICAgICAgIGlmIHdlIHN0aWxsIGRvbid0IGhhdmUgZW5vdWdoIGRhdGEuCisKKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlLmpzOgorICAgICAgICAoQnVpbGRib3RRdWV1 ZS5wcm90b3R5cGUubG9hZE1vcmVIaXN0b3JpY2FsSXRlcmF0aW9ucyk6IEFkZGVkIGEgZnVuY3Rp b24gdGhhdCBsb2FkcworICAgICAgICAxMCBtb3JlIGl0ZXJhdGlvbnMgaW50ZWxsaWdlbnRseS4K KwogMjAxNC0wOC0yNiAgTWF0dCBMaWxlayAgPG1ybEBhcHBsZS5jb20+CiAKICAgICAgICAgQWRk IFdlYktpdCBTUEkgdG8gY29udHJvbCB0aGUgbmF2aWdhdG9yLnN0YW5kYWxvbmUgcHJvcGVydHkK SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90QnVpbGRlclF1ZXVlVmlldy5qcwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEJ1aWxkZXJRdWV1ZVZp ZXcuanMJKHJldmlzaW9uIDE3Mjk0NikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90 QnVpbGRlclF1ZXVlVmlldy5qcwkod29ya2luZyBjb3B5KQpAQCAtMTA4LDkgKzEwOCw3IEBAIEJ1 aWxkYm90QnVpbGRlclF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgICAgICBp ZiAoZmlyc3RSZWNlbnRVbnN1Y2Nlc3NmdWxJdGVyYXRpb24pIHsKICAgICAgICAgICAgICAgICAg ICAgLy8gV2UgaGF2ZSBhIGZhaWxlZCBpdGVyYXRpb24gYnV0IG5vIHN1Y2Nlc3NmdWwuIEl0IG1p Z2h0IGJlIGZ1cnRoZXIgYmFjayBpbiB0aW1lLgotICAgICAgICAgICAgICAgICAgICAvLyBVcGRh dGUgYWxsIHRoZSBpdGVyYXRpb25zIHNvIHdlIGdldCBtb3JlIGhpc3RvcnkuCi0gICAgICAgICAg ICAgICAgICAgIC8vIEZJWE1FOiBJdCBjYW4gYmUgdmVyeSB0aW1lIGNvbnN1bWluZyB0byBsb2Fk IGFsbCBpdGVyYXRpb25zLCB3ZSBzaG91bGQgbG9hZCBwcm9ncmVzc2l2ZWx5LgotICAgICAgICAg ICAgICAgICAgICBxdWV1ZS5pdGVyYXRpb25zLmZvckVhY2goZnVuY3Rpb24oaXRlcmF0aW9uKSB7 IGl0ZXJhdGlvbi51cGRhdGUoKTsgfSk7CisgICAgICAgICAgICAgICAgICAgIHF1ZXVlLmxvYWRN b3JlSGlzdG9yaWNhbEl0ZXJhdGlvbnMoKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0 aW9uLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0 aW9uLmpzCShyZXZpc2lvbiAxNzI5NDYpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJv dEl0ZXJhdGlvbi5qcwkod29ya2luZyBjb3B5KQpAQCAtNDAsNiArNDAsNyBAQCBCdWlsZGJvdEl0 ZXJhdGlvbiA9IGZ1bmN0aW9uKHF1ZXVlLCBkYXRhCiAgICAgdGhpcy5pZCA9IGRhdGFPcklEOwog CiAgICAgdGhpcy5sb2FkZWQgPSBmYWxzZTsKKyAgICB0aGlzLmlzTG9hZGluZyA9IGZhbHNlOwog CiAgICAgdGhpcy5vcGVuU291cmNlUmV2aXNpb24gPSBudWxsOwogICAgIHRoaXMuaW50ZXJuYWxS ZXZpc2lvbiA9IG51bGw7CkBAIC0yOTUsNyArMjk2LDEzIEBAIEJ1aWxkYm90SXRlcmF0aW9uLnBy b3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMucXVldWUuYnVpbGRib3QubmVlZHNBdXRoZW50 aWNhdGlvbiAmJiB0aGlzLnF1ZXVlLmJ1aWxkYm90LmF1dGhlbnRpY2F0aW9uU3RhdHVzID09PSBC dWlsZGJvdC5BdXRoZW50aWNhdGlvblN0YXR1cy5JbnZhbGlkQ3JlZGVudGlhbHMpCiAgICAgICAg ICAgICByZXR1cm47CiAKKyAgICAgICAgaWYgKHRoaXMuaXNMb2FkaW5nKQorICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIHRoaXMuaXNMb2FkaW5nID0gdHJ1ZTsKKwogICAgICAgICBKU09O LmxvYWQodGhpcy5xdWV1ZS5iYXNlVVJMICsgIi9idWlsZHMvIiArIHRoaXMuaWQsIGZ1bmN0aW9u KGRhdGEpIHsKKyAgICAgICAgICAgIHRoaXMuaXNMb2FkaW5nID0gZmFsc2U7CiAgICAgICAgICAg ICB0aGlzLnF1ZXVlLmJ1aWxkYm90LmlzQXV0aGVudGljYXRlZCA9IHRydWU7CiAgICAgICAgICAg ICBpZiAoIWRhdGEgfHwgIWRhdGEucHJvcGVydGllcykKICAgICAgICAgICAgICAgICByZXR1cm47 CkBAIC0zMDMsNiArMzEwLDcgQEAgQnVpbGRib3RJdGVyYXRpb24ucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5fdXBkYXRlV2l0aERhdGEoZGF0YSk7CiAgICAgICAgIH0uYmluZCh0aGlz KSwKICAgICAgICAgZnVuY3Rpb24oZGF0YSkgeworICAgICAgICAgICAgdGhpcy5pc0xvYWRpbmcg PSBmYWxzZTsKICAgICAgICAgICAgIGlmIChkYXRhLmVycm9yVHlwZSA9PT0gSlNPTi5Mb2FkRXJy b3IgJiYgZGF0YS5lcnJvckhUVFBDb2RlID09PSA0MDEpIHsKICAgICAgICAgICAgICAgICB0aGlz LnF1ZXVlLmJ1aWxkYm90LmlzQXV0aGVudGljYXRlZCA9IGZhbHNlOwogICAgICAgICAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKEJ1aWxkYm90SXRlcmF0aW9uLkV2ZW50LlVu YXV0aG9yaXplZEFjY2Vzcyk7CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1 ZXVlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWUu anMJKHJldmlzaW9uIDE3Mjk0NikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVl dWUuanMJKHdvcmtpbmcgY29weSkKQEAgLTE1Miw2ICsxNTIsMzIgQEAgQnVpbGRib3RRdWV1ZS5w cm90b3R5cGUgPSB7CiAgICAgICAgICk7CiAgICAgfSwKIAorICAgIGxvYWRNb3JlSGlzdG9yaWNh bEl0ZXJhdGlvbnM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBpbmRleE9mRmlyc3RO ZXdseUxvYWRpbmdJdGVyYXRpb247CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5p dGVyYXRpb25zLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICBpZiAoaW5kZXhPZkZpcnN0TmV3 bHlMb2FkaW5nSXRlcmF0aW9uICE9PSB1bmRlZmluZWQgJiYgaSA+PSBpbmRleE9mRmlyc3ROZXds eUxvYWRpbmdJdGVyYXRpb24gKyBCdWlsZGJvdFF1ZXVlLlJlY2VudEl0ZXJhdGlvbnNUb0xvYWQp CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgdmFyIGl0ZXJhdGlvbiA9IHRo aXMuaXRlcmF0aW9uc1tpXTsKKyAgICAgICAgICAgIGlmICghaXRlcmF0aW9uLmZpbmlzaGVkKQor ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgaWYgKGl0ZXJhdGlvbi5pc0xv YWRpbmcpIHsKKyAgICAgICAgICAgICAgICAvLyBDYWxsZXIgbGFja3MgdmlzaWJpbGl0eSBpbnRv IGxvYWRpbmcsIHNvIGl0IGlzIGxpa2VseSB0byBjYWxsIHRoaXMgZnVuY3Rpb24gdG9vIG9mdGVu LgorICAgICAgICAgICAgICAgIC8vIEdpdmUgaXQgYSBjaGFuY2UgdG8gYW5hbHl6ZSBldmVyeXRo aW5nIHRoYXQncyBiZWVuIGFscmVhZHkgcmVxdWVzdGVkIGZpcnN0LCBhbmQgdGhlbiBpdCBjYW4g ZGVjaWRlIHdoZXRoZXIgaXQgbmVlZHMgbW9yZS4KKyAgICAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoaXRlcmF0aW9uLmxvYWRlZCAmJiBpbmRleE9m Rmlyc3ROZXdseUxvYWRpbmdJdGVyYXRpb24gIT09IHVuZGVmaW5lZCkgeworICAgICAgICAgICAg ICAgIC8vIFRoZXJlIHdhcyBhIGdhcCBiZXR3ZWVuIGxvYWRlZCBpdGVyYXRpb25zLCB3aGljaCB3 ZSd2ZSBjbG9zZWQgbm93LgorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgIGlmICghaXRlcmF0aW9uLmxvYWRlZCkgeworICAgICAgICAgICAgICAgIGlm IChpbmRleE9mRmlyc3ROZXdseUxvYWRpbmdJdGVyYXRpb24gPT09IHVuZGVmaW5lZCkKKyAgICAg ICAgICAgICAgICAgICAgaW5kZXhPZkZpcnN0TmV3bHlMb2FkaW5nSXRlcmF0aW9uID0gaTsKKyAg ICAgICAgICAgICAgICBpdGVyYXRpb24udXBkYXRlKCk7CisgICAgICAgICAgICB9CisgICAgICAg IH0KKyAgICB9LAorCiAgICAgdXBkYXRlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlz Ll9sb2FkKHRoaXMuYmFzZVVSTCwgZnVuY3Rpb24oZGF0YSkgewo=