209481 2020-03-24 09:29:44 -0700 [ews] position in queue shown in status-bubble is larger than actual position 2020-03-24 13:37:17 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1633338 0 aakash_jain 2020-03-24 09:29:44 -0700 [ews] position in queue shown in status-bubble is larger than actual position. This has been happening since launching commit-queue. 1633359 1 aakash_jain 2020-03-24 09:44:53 -0700 The logic to calculate the position in queue is: 1) define a start time (e.g.: 3 days back from current time) 2) count number of patches sent to buildbot from star-time and patch-modified-time. 3) get all builds on a queue after start-time and find list of patches from those builds 4) position_in_queue = output of #2 - output of #3 Earlier the patch-modified-time was same as the timestamp when the patch was sent to buildbot. Now we also have sent_to_commit_queue, and patch-modified-time can be the timestamp when the patch was sent-to-commit-queue. Therefore by using patch-modified-time, we might be taking a larger time-range, and there would be more patches included in #2, and some of those patches might have been processed by rest of ews queues before the start-time, and later-on by commit-queue. Using created timestamp instead of modified timestamp of patch should fix this issue. 1633361 2 394376 aakash_jain 2020-03-24 09:46:58 -0700 Created attachment 394376 Patch 1633395 3 394376 jbedard 2020-03-24 11:22:27 -0700 Comment on attachment 394376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394376&action=review > Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py:276 > + if patch.created < from_timestamp: Confused what this has to do with the bug title. 1633426 4 394376 aakash_jain 2020-03-24 12:34:18 -0700 Comment on attachment 394376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394376&action=review >> Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py:276 >> + if patch.created < from_timestamp: > > Confused what this has to do with the bug title. Consider the scenario in which: - a new queue 'X' was added 2 days back (with StatusBubble.DAYS_TO_CHECK = 3) - a patch was uploaded 4 days back, and so it would never be processed on the new queue 'X', and so the bubble for 'X' should NOT be displayed. - Now let's say the patch was cq+ today, and so the patch-modified-time would be updated to today. This would result in incorrectly showing the bubble for queue 'X' (with position #1) instead of hiding the bubble for 'X'. This is because the logic was based on patch-modified-time. Therefore patch created time is a better indicator. Also note that the 'created' timestamp is from django database (not from bugzilla), so it would be very close to the time when the patch was sent to buildbot for processing on all ews queues (except commit-queue). 1633427 5 394396 aakash_jain 2020-03-24 12:35:03 -0700 Created attachment 394396 Patch 1633450 6 jbedard 2020-03-24 13:30:07 -0700 (In reply to Aakash Jain from comment #4) > Comment on attachment 394376 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394376&action=review > > >> Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py:276 > >> + if patch.created < from_timestamp: > > > > Confused what this has to do with the bug title. > > Consider the scenario in which: > - a new queue 'X' was added 2 days back (with StatusBubble.DAYS_TO_CHECK = 3) > - a patch was uploaded 4 days back, and so it would never be processed on > the new queue 'X', and so the bubble for 'X' should NOT be displayed. > - Now let's say the patch was cq+ today, and so the patch-modified-time > would be updated to today. > > This would result in incorrectly showing the bubble for queue 'X' (with > position #1) instead of hiding the bubble for 'X'. This is because the logic > was based on patch-modified-time. Therefore patch created time is a better > indicator. > > Also note that the 'created' timestamp is from django database (not from > bugzilla), so it would be very close to the time when the patch was sent to > buildbot for processing on all ews queues (except commit-queue). Thanks for the explanation! 1633455 7 ews-feeder 2020-03-24 13:36:35 -0700 Committed r258937: <https://trac.webkit.org/changeset/258937> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394396. 1633456 8 webkit-bug-importer 2020-03-24 13:37:17 -0700 <rdar://problem/60839365> 394376 2020-03-24 09:46:58 -0700 2020-03-24 12:35:00 -0700 Patch bug-209481-20200324124657.patch text/plain 3840 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODkxMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDIwLTAzLTI0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBwb3NpdGlvbiBpbiBxdWV1ZSBzaG93biBpbiBzdGF0dXMtYnVi YmxlIGlzIGxhcmdlciB0aGFuIGFjdHVhbCBwb3NpdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5NDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy92aWV3cy9zdGF0dXNidWJibGUucHk6CisgICAgICAgIChTdGF0dXNCdWJibGUuX3F1ZXVlX3Bv c2l0aW9uKTogVXNlIGNyZWF0ZWQgdGltZXN0YW1wIGluc3RlYWQgb2YgbW9kaWZpZWQuCisKIDIw MjAtMDMtMjQgIENocmlzIExvcmQgIDxjbG9yZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd W1dQRV0gV0VCX1BST0NFU1NfQ01EX1BSRUZJWCBhbmQgb3RoZXJzIGhhdmUgc3RvcHBlZCB3b3Jr aW5nCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9zdGF0 dXNidWJibGUucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFw cC9ld3Mvdmlld3Mvc3RhdHVzYnViYmxlLnB5CShyZXZpc2lvbiAyNTg5MTIpCisrKyBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9zdGF0dXNidWJibGUucHkJKHdvcmtp bmcgY29weSkKQEAgLTIzLDYgKzIzLDcgQEAKIGZyb20gX19mdXR1cmVfXyBpbXBvcnQgdW5pY29k ZV9saXRlcmFscwogCiBpbXBvcnQgZGF0ZXRpbWUKK2ltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcmUK IAogZnJvbSBkamFuZ28uaHR0cCBpbXBvcnQgSHR0cFJlc3BvbnNlCkBAIC0zNSw2ICszNiw4IEBA IGZyb20gZXdzLm1vZGVscy5idWlsZCBpbXBvcnQgQnVpbGQKIGZyb20gZXdzLm1vZGVscy5wYXRj aCBpbXBvcnQgUGF0Y2gKIGltcG9ydCBld3MuY29uZmlnIGFzIGNvbmZpZwogCitfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoX19uYW1lX18pCisKIAogY2xhc3MgU3RhdHVzQnViYmxlKFZpZXcpOgog ICAgICMgVGhlc2UgcXVldWUgbmFtZXMgYXJlIGZyb20gc2hvcnRuYW1lIGluIGh0dHBzOi8vdHJh Yy53ZWJraXQub3JnL2Jyb3dzZXIvd2Via2l0L3RydW5rL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9jb25maWcuanNvbgpAQCAtMjcwLDcgKzI3Myw3IEBAIGNsYXNzIFN0YXR1c0J1 YmJsZShWaWV3KToKICAgICAgICAgIyBGSVhNRTogSGFuZGxlIHJldHJpZWQgYnVpbGRzIGFuZCBj YW5jZWxsZWQgYnVpbGQtcmVxdWVzdHMgYXMgd2VsbC4KICAgICAgICAgZnJvbV90aW1lc3RhbXAg PSB0aW1lem9uZS5ub3coKSAtIGRhdGV0aW1lLnRpbWVkZWx0YShkYXlzPVN0YXR1c0J1YmJsZS5E QVlTX1RPX0NIRUNLKQogCi0gICAgICAgIGlmIHBhdGNoLm1vZGlmaWVkIDwgZnJvbV90aW1lc3Rh bXA6CisgICAgICAgIGlmIHBhdGNoLmNyZWF0ZWQgPCBmcm9tX3RpbWVzdGFtcDoKICAgICAgICAg ICAgICMgRG8gbm90IGRpc3BsYXkgYnViYmxlIGZvciBvbGQgcGF0Y2ggZm9yIHdoaWNoIG5vIGJ1 aWxkIGhhcyBiZWVuIHJlcG9ydGVkIG9uIGdpdmVuIHF1ZXVlLgogICAgICAgICAgICAgIyBNb3N0 IGxpa2VseSB0aGUgcGF0Y2ggd291bGQgbmV2ZXIgYmUgcHJvY2Vzc2VkIG9uIHRoaXMgcXVldWUs IHNpbmNlIGVpdGhlciB0aGUgcXVldWUgd2FzCiAgICAgICAgICAgICAjIGFkZGVkIGFmdGVyIHRo ZSBwYXRjaCB3YXMgc3VibWl0dGVkLCBvciBidWlsZCByZXF1ZXN0IGZvciB0aGF0IHBhdGNoIHdh cyBjYW5jZWxsZWQuCkBAIC0yNzgsMjEgKzI4MSwyMiBAQCBjbGFzcyBTdGF0dXNCdWJibGUoVmll dyk6CiAKICAgICAgICAgc2VudCA9ICdzZW50X3RvX2NvbW1pdF9xdWV1ZScgaWYgcXVldWUgPT0g J2NvbW1pdCcgZWxzZSAnc2VudF90b19idWlsZGJvdCcKICAgICAgICAgcHJldmlvdXNseV9zZW50 X3BhdGNoZXMgPSBzZXQoUGF0Y2gub2JqZWN0cwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLmZpbHRlcihtb2RpZmllZF9fZ3RlPWZyb21fdGltZXN0YW1wKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLmZpbHRlcihjcmVhdGVkX19n dGU9ZnJvbV90aW1lc3RhbXApCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAuZmlsdGVyKCoqe3NlbnQ6IFRydWV9KQogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLmZpbHRlcihvYnNvbGV0ZT1GYWxzZSkKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC5maWx0ZXIobW9kaWZpZWRfX2x0PXBhdGNoLm1vZGlm aWVkKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC5maWx0ZXIo Y3JlYXRlZF9fbHQ9cGF0Y2guY3JlYXRlZCkpCiAgICAgICAgIGlmIHBhcmVudF9xdWV1ZToKICAg ICAgICAgICAgIHJlY2VudF9idWlsZHNfcGFyZW50X3F1ZXVlID0gQnVpbGQub2JqZWN0cyBcCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuZmlsdGVyKG1vZGlm aWVkX19ndGU9ZnJvbV90aW1lc3RhbXApIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC5maWx0ZXIoY3JlYXRlZF9fZ3RlPWZyb21fdGltZXN0YW1wKSBcCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuZmlsdGVyKGJ1aWxk ZXJfZGlzcGxheV9uYW1lPXBhcmVudF9xdWV1ZSkKICAgICAgICAgICAgIHByb2Nlc3NlZF9wYXRj aGVzX3BhcmVudF9xdWV1ZSA9IHNldChbYnVpbGQucGF0Y2ggZm9yIGJ1aWxkIGluIHJlY2VudF9i dWlsZHNfcGFyZW50X3F1ZXVlXSkKICAgICAgICAgICAgIHJldHVybiBsZW4ocHJldmlvdXNseV9z ZW50X3BhdGNoZXMgLSBwcm9jZXNzZWRfcGF0Y2hlc19wYXJlbnRfcXVldWUpICsgMQogCiAgICAg ICAgIHJlY2VudF9idWlsZHMgPSBCdWlsZC5vYmplY3RzIFwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAuZmlsdGVyKG1vZGlmaWVkX19ndGU9ZnJvbV90aW1lc3RhbXApIFwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAuZmlsdGVyKGNyZWF0ZWRfX2d0ZT1mcm9tX3RpbWVzdGFtcCkg XAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIC5maWx0ZXIoYnVpbGRlcl9kaXNwbGF5X25h bWU9cXVldWUpCiAgICAgICAgIHByb2Nlc3NlZF9wYXRjaGVzID0gc2V0KFtidWlsZC5wYXRjaCBm b3IgYnVpbGQgaW4gcmVjZW50X2J1aWxkc10pCisgICAgICAgIF9sb2cuZGVidWcoJ1BhdGNoOiB7 fSwgcXVldWU6IHt9LCBwcmV2aW91cyBwYXRjaGVzOiB7fScuZm9ybWF0KHBhdGNoLnBhdGNoX2lk LCBxdWV1ZSwgcHJldmlvdXNseV9zZW50X3BhdGNoZXMgLSBwcm9jZXNzZWRfcGF0Y2hlcykpCiAg ICAgICAgIHJldHVybiBsZW4ocHJldmlvdXNseV9zZW50X3BhdGNoZXMgLSBwcm9jZXNzZWRfcGF0 Y2hlcykgKyAxCiAKICAgICBkZWYgX2J1aWxkX2J1YmJsZXNfZm9yX3BhdGNoKHNlbGYsIHBhdGNo LCBoaWRlX2ljb25zPUZhbHNlKToK 394396 2020-03-24 12:35:03 -0700 2020-03-24 13:36:35 -0700 Patch bug-209481-20200324153502.patch text/plain 4676 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODkxMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDIwLTAzLTI0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBwb3NpdGlvbiBpbiBxdWV1ZSBzaG93biBpbiBzdGF0dXMtYnVi YmxlIGlzIGxhcmdlciB0aGFuIGFjdHVhbCBwb3NpdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5NDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy92aWV3cy9zdGF0dXNidWJibGUucHk6CisgICAgICAgIChTdGF0dXNCdWJibGUuX3F1ZXVlX3Bv c2l0aW9uKTogVXNlIGNyZWF0ZWQgdGltZXN0YW1wIGluc3RlYWQgb2YgbW9kaWZpZWQuCisKIDIw MjAtMDMtMjQgIENocmlzIExvcmQgIDxjbG9yZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd W1dQRV0gV0VCX1BST0NFU1NfQ01EX1BSRUZJWCBhbmQgb3RoZXJzIGhhdmUgc3RvcHBlZCB3b3Jr aW5nCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9zdGF0 dXNidWJibGUucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFw cC9ld3Mvdmlld3Mvc3RhdHVzYnViYmxlLnB5CShyZXZpc2lvbiAyNTg5MTIpCisrKyBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9zdGF0dXNidWJibGUucHkJKHdvcmtp bmcgY29weSkKQEAgLTIzLDYgKzIzLDcgQEAKIGZyb20gX19mdXR1cmVfXyBpbXBvcnQgdW5pY29k ZV9saXRlcmFscwogCiBpbXBvcnQgZGF0ZXRpbWUKK2ltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcmUK IAogZnJvbSBkamFuZ28uaHR0cCBpbXBvcnQgSHR0cFJlc3BvbnNlCkBAIC0zNSw2ICszNiw4IEBA IGZyb20gZXdzLm1vZGVscy5idWlsZCBpbXBvcnQgQnVpbGQKIGZyb20gZXdzLm1vZGVscy5wYXRj aCBpbXBvcnQgUGF0Y2gKIGltcG9ydCBld3MuY29uZmlnIGFzIGNvbmZpZwogCitfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoX19uYW1lX18pCisKIAogY2xhc3MgU3RhdHVzQnViYmxlKFZpZXcpOgog ICAgICMgVGhlc2UgcXVldWUgbmFtZXMgYXJlIGZyb20gc2hvcnRuYW1lIGluIGh0dHBzOi8vdHJh Yy53ZWJraXQub3JnL2Jyb3dzZXIvd2Via2l0L3RydW5rL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9jb25maWcuanNvbgpAQCAtMTEwLDcgKzExMyw3IEBAIGNsYXNzIFN0YXR1c0J1 YmJsZShWaWV3KToKICAgICAgICAgICAgIGJ1YmJsZVsnZGV0YWlsc19tZXNzYWdlJ10gPSAnV2Fp dGluZyBmb3IgYXZhaWxhYmxlIGJvdCB0byByZXRyeSB0aGUgYnVpbGQuXG5cblJlY2VudCBtZXNz YWdlczonICsgc2VsZi5fc3RlcHNfbWVzc2FnZXNfZnJvbV9tdWx0aXBsZV9idWlsZHMoYnVpbGRz KQogICAgICAgICBlbGlmIGJ1aWxkLnJlc3VsdCA9PSBCdWlsZGJvdC5TVUNDRVNTOgogICAgICAg ICAgICAgaWYgaXNfcGFyZW50X2J1aWxkOgotICAgICAgICAgICAgICAgIGlmIHBhdGNoLm1vZGlm aWVkIDwgKHRpbWV6b25lLm5vdygpIC0gZGF0ZXRpbWUudGltZWRlbHRhKGRheXM9U3RhdHVzQnVi YmxlLkRBWVNfVE9fQ0hFQ0spKToKKyAgICAgICAgICAgICAgICBpZiBwYXRjaC5jcmVhdGVkIDwg KHRpbWV6b25lLm5vdygpIC0gZGF0ZXRpbWUudGltZWRlbHRhKGRheXM9U3RhdHVzQnViYmxlLkRB WVNfVE9fQ0hFQ0spKToKICAgICAgICAgICAgICAgICAgICAgIyBEbyBub3QgZGlzcGxheSBidWJi bGUgZm9yIG9sZCBwYXRjaCBmb3Igd2hpY2ggbm8gYnVpbGQgaGFzIGJlZW4gcmVwb3J0ZWQgb24g Z2l2ZW4gcXVldWUuCiAgICAgICAgICAgICAgICAgICAgICMgTW9zdCBsaWtlbHkgdGhlIHBhdGNo IHdvdWxkIG5ldmVyIGJlIHByb2Nlc3NlZCBvbiB0aGlzIHF1ZXVlLCBzaW5jZSBlaXRoZXIgdGhl IHF1ZXVlIHdhcwogICAgICAgICAgICAgICAgICAgICAjIGFkZGVkIGFmdGVyIHRoZSBwYXRjaCB3 YXMgc3VibWl0dGVkLCBvciBidWlsZCByZXF1ZXN0IGZvciB0aGF0IHBhdGNoIHdhcyBjYW5jZWxs ZWQuCkBAIC0yNzAsNyArMjczLDcgQEAgY2xhc3MgU3RhdHVzQnViYmxlKFZpZXcpOgogICAgICAg ICAjIEZJWE1FOiBIYW5kbGUgcmV0cmllZCBidWlsZHMgYW5kIGNhbmNlbGxlZCBidWlsZC1yZXF1 ZXN0cyBhcyB3ZWxsLgogICAgICAgICBmcm9tX3RpbWVzdGFtcCA9IHRpbWV6b25lLm5vdygpIC0g ZGF0ZXRpbWUudGltZWRlbHRhKGRheXM9U3RhdHVzQnViYmxlLkRBWVNfVE9fQ0hFQ0spCiAKLSAg ICAgICAgaWYgcGF0Y2gubW9kaWZpZWQgPCBmcm9tX3RpbWVzdGFtcDoKKyAgICAgICAgaWYgcGF0 Y2guY3JlYXRlZCA8IGZyb21fdGltZXN0YW1wOgogICAgICAgICAgICAgIyBEbyBub3QgZGlzcGxh eSBidWJibGUgZm9yIG9sZCBwYXRjaCBmb3Igd2hpY2ggbm8gYnVpbGQgaGFzIGJlZW4gcmVwb3J0 ZWQgb24gZ2l2ZW4gcXVldWUuCiAgICAgICAgICAgICAjIE1vc3QgbGlrZWx5IHRoZSBwYXRjaCB3 b3VsZCBuZXZlciBiZSBwcm9jZXNzZWQgb24gdGhpcyBxdWV1ZSwgc2luY2UgZWl0aGVyIHRoZSBx dWV1ZSB3YXMKICAgICAgICAgICAgICMgYWRkZWQgYWZ0ZXIgdGhlIHBhdGNoIHdhcyBzdWJtaXR0 ZWQsIG9yIGJ1aWxkIHJlcXVlc3QgZm9yIHRoYXQgcGF0Y2ggd2FzIGNhbmNlbGxlZC4KQEAgLTI3 OCwyMSArMjgxLDIyIEBAIGNsYXNzIFN0YXR1c0J1YmJsZShWaWV3KToKIAogICAgICAgICBzZW50 ID0gJ3NlbnRfdG9fY29tbWl0X3F1ZXVlJyBpZiBxdWV1ZSA9PSAnY29tbWl0JyBlbHNlICdzZW50 X3RvX2J1aWxkYm90JwogICAgICAgICBwcmV2aW91c2x5X3NlbnRfcGF0Y2hlcyA9IHNldChQYXRj aC5vYmplY3RzCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuZmls dGVyKG1vZGlmaWVkX19ndGU9ZnJvbV90aW1lc3RhbXApCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAuZmlsdGVyKGNyZWF0ZWRfX2d0ZT1mcm9tX3RpbWVzdGFtcCkK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC5maWx0ZXIoKip7c2Vu dDogVHJ1ZX0pCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuZmls dGVyKG9ic29sZXRlPUZhbHNlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgLmZpbHRlcihtb2RpZmllZF9fbHQ9cGF0Y2gubW9kaWZpZWQpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLmZpbHRlcihjcmVhdGVkX19sdD1wYXRjaC5j cmVhdGVkKSkKICAgICAgICAgaWYgcGFyZW50X3F1ZXVlOgogICAgICAgICAgICAgcmVjZW50X2J1 aWxkc19wYXJlbnRfcXVldWUgPSBCdWlsZC5vYmplY3RzIFwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC5maWx0ZXIobW9kaWZpZWRfX2d0ZT1mcm9tX3RpbWVz dGFtcCkgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLmZp bHRlcihjcmVhdGVkX19ndGU9ZnJvbV90aW1lc3RhbXApIFwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC5maWx0ZXIoYnVpbGRlcl9kaXNwbGF5X25hbWU9cGFy ZW50X3F1ZXVlKQogICAgICAgICAgICAgcHJvY2Vzc2VkX3BhdGNoZXNfcGFyZW50X3F1ZXVlID0g c2V0KFtidWlsZC5wYXRjaCBmb3IgYnVpbGQgaW4gcmVjZW50X2J1aWxkc19wYXJlbnRfcXVldWVd KQogICAgICAgICAgICAgcmV0dXJuIGxlbihwcmV2aW91c2x5X3NlbnRfcGF0Y2hlcyAtIHByb2Nl c3NlZF9wYXRjaGVzX3BhcmVudF9xdWV1ZSkgKyAxCiAKICAgICAgICAgcmVjZW50X2J1aWxkcyA9 IEJ1aWxkLm9iamVjdHMgXAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIC5maWx0ZXIobW9k aWZpZWRfX2d0ZT1mcm9tX3RpbWVzdGFtcCkgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAg IC5maWx0ZXIoY3JlYXRlZF9fZ3RlPWZyb21fdGltZXN0YW1wKSBcCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgLmZpbHRlcihidWlsZGVyX2Rpc3BsYXlfbmFtZT1xdWV1ZSkKICAgICAgICAg cHJvY2Vzc2VkX3BhdGNoZXMgPSBzZXQoW2J1aWxkLnBhdGNoIGZvciBidWlsZCBpbiByZWNlbnRf YnVpbGRzXSkKKyAgICAgICAgX2xvZy5kZWJ1ZygnUGF0Y2g6IHt9LCBxdWV1ZToge30sIHByZXZp b3VzIHBhdGNoZXM6IHt9Jy5mb3JtYXQocGF0Y2gucGF0Y2hfaWQsIHF1ZXVlLCBwcmV2aW91c2x5 X3NlbnRfcGF0Y2hlcyAtIHByb2Nlc3NlZF9wYXRjaGVzKSkKICAgICAgICAgcmV0dXJuIGxlbihw cmV2aW91c2x5X3NlbnRfcGF0Y2hlcyAtIHByb2Nlc3NlZF9wYXRjaGVzKSArIDEKIAogICAgIGRl ZiBfYnVpbGRfYnViYmxlc19mb3JfcGF0Y2goc2VsZiwgcGF0Y2gsIGhpZGVfaWNvbnM9RmFsc2Up Ogo=