83038 2012-04-03 09:10:05 -0700 EWS shouldn't sleep if there are new patches in its queue 2012-09-18 08:30:08 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ossy webkit-unassigned abarth dpranke eric galpeter ojan ossy szledan tony webkit.review.bot oldest_to_newest 594544 0 ossy 2012-04-03 09:10:05 -0700 I found a strange thing today. Qt EWS tries to process a security patch (134942 ) again and again. Of course it can't, because the EWS isn't the member of the security group. But the problem is that after it can't process the attachment, it says that queue is empty (but it isn't!!!) and it sleeps 2 minutes and push the security patch to the end of the queue: Fetching: https://bugs.webkit.org/attachment.cgi?id=134942&action=edit webkitpy.common.net.statusserver: [INFO] Releasing work item 134942 from qt-ews No work item. Sleeping until 2012-04-03 09:06:02 (2 mins). #1 135335 #2 135336 #3 135337 #4 135338 #5 134942 When it finished processing the other patches and the security patch comes again it will sleep 2 minutes again and push it to the end of the queue ... 594548 1 ossy 2012-04-03 09:17:04 -0700 Hmmmm ... It seems it is unrelated to security bugs, but related to releasing work items somehow: Fetching: https://bugs.webkit.org/attachment.cgi?id=134942&action=edit webkitpy.common.net.statusserver: [INFO] Releasing work item 134942 from qt-wk2-ews No work item. Sleeping until 2012-04-03 09:15:50 (2 mins). But the queue wasn't empty, there were 6 patches in it: #1 135336 #2 135337 #3 135338 #4 135339 #5 135340 #6 135341 594553 2 ossy 2012-04-03 09:26:32 -0700 Otherwise we shouldn't allow submitting security patches to EWS queues somehow. How was is possible? Is feeder queue bot in the security group? Or did somebody push the "Submit for EWS analysis" button accidentally? 594585 3 abarth 2012-04-03 10:04:09 -0700 Folks submit security bugs to the EWS all the time. We should just have the bots error out if they can't fetch the attachment. 594744 4 eric 2012-04-03 12:28:27 -0700 We just need to catch the "Failed to fetch" case, and not have it go down the "we have nothing left to do" logic path. 598000 5 ossy 2012-04-07 12:50:58 -0700 (In reply to comment #3) > Folks submit security bugs to the EWS all the time. We should just have the bots error out if they can't fetch the attachment. Is there an EWS in the security group? It would be great if security patches aren't blocks the EWS bots because they can't fetch the patches. 598011 6 abarth 2012-04-07 16:33:35 -0700 > Is there an EWS in the security group? Nope, but sometimes folks add them explicitly to the CC list. > It would be great if security patches aren't blocks the EWS bots because they can't fetch the patches. Correct. We need to error out in that case rather than block the queue. 704696 7 ossy 2012-08-25 07:52:10 -0700 +info for fixing this bug: $ Tools/Scripts/webkit-patch apply-attachment 157161 ----------------------------------------------------- Fetching: https://bugs.webkit.org/attachment.cgi?id=157161&action=edit Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 84, in <module> main() File "Tools/Scripts/webkit-patch", line 79, in main WebKitPatch(os.path.abspath(__file__)).main() File "/home/oszi/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 311, in main result = command.check_arguments_and_execute(options, args, self) File "/home/oszi/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 120, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/home/oszi/WebKit/Tools/Scripts/webkitpy/tool/commands/download.py", line 159, in execute bugs_to_patches = self._collect_patches_by_bug(patches) File "/home/oszi/WebKit/Tools/Scripts/webkitpy/tool/commands/download.py", line 151, in _collect_patches_by_bug bugs_to_patches[patch.bug_id()] = bugs_to_patches.get(patch.bug_id(), []) + [patch] AttributeError: 'NoneType' object has no attribute 'bug_id' log from the EWS bot: ---------------------- Fetching: https://bugs.webkit.org/attachment.cgi?id=157161&action=edit No work item. Sleeping until 2012-08-25 07:37:22 (2 mins). Fetching: https://bugs.webkit.org/attachment.cgi?id=149115&action=edit No work item. Sleeping until 2012-08-25 07:39:24 (2 mins). Fetching: https://bugs.webkit.org/attachment.cgi?id=159810&action=edit No work item. Sleeping until 2012-08-25 07:41:25 (2 mins). Fetching: https://bugs.webkit.org/attachment.cgi?id=160209&action=edit No work item. Sleeping until 2012-08-25 07:43:27 (2 mins). Fetching: https://bugs.webkit.org/attachment.cgi?id=158975&action=edit No work item. Sleeping until 2012-08-25 07:45:29 (2 mins). Fetching: https://bugs.webkit.org/attachment.cgi?id=160174&action=edit No work item. Sleeping until 2012-08-25 07:47:31 (2 mins). Fetching: https://bugs.webkit.org/attachment.cgi?id=157161&action=edit No work item. Sleeping until 2012-08-25 07:49:32 (2 mins). Fetching: https://bugs.webkit.org/attachment.cgi?id=149115&action=edit No work item. Sleeping until 2012-08-25 07:51:34 (2 mins). 707639 8 ossy 2012-08-29 10:55:13 -0700 Now there are 25 patches in Qt-EWS queue, but it is sleeping 2 minutes after all patches ... It isn't so good. Fetching: https://bugs.webkit.org/attachment.cgi?id=160209&action=edit webkitpy.common.net.statusserver: [INFO] Releasing work item 160209 from qt-wk2-ews No work item. Sleeping until 2012-08-29 19:52:36 (2 mins). Fetching: https://bugs.webkit.org/attachment.cgi?id=149115&action=edit webkitpy.common.net.statusserver: [INFO] Releasing work item 149115 from qt-wk2-ews No work item. Sleeping until 2012-08-29 19:54:38 (2 mins). ... I propose decrease sleeping time to 10 seconds until proper fix. Any objections? 707651 9 161268 ossy 2012-08-29 11:04:22 -0700 Created attachment 161268 Patch workaround until proper fix 707667 10 161268 abarth 2012-08-29 11:15:02 -0700 Comment on attachment 161268 Patch This will increase the load on the appengine instance by a factor of 12. 707684 11 ossy 2012-08-29 11:26:42 -0700 (In reply to comment #10) > (From update of attachment 161268 [details]) > This will increase the load on the appengine instance by a factor of 12. Is the load of appengine instance more important to waiting 1-2 hours for all patch because of this crazy bug? Is there any volunteer to do a proper fix for this half year bug? 707717 12 eric 2012-08-29 12:08:24 -0700 This bug should be trivial to fix. def _next_patch(self): patch_id = self._tool.status_server.next_work_item(self.name) if not patch_id: return None patch = self._tool.bugs.fetch_attachment(patch_id) if not patch: # FIXME: Using a fake patch because release_work_item has the wrong API. # We also don't really need to release the lock (although that's fine), # mostly we just need to remove this bogus patch from our queue. # If for some reason bugzilla is just down, then it will be re-fed later. patch = Attachment({'id': patch_id}, None) self._release_work_item(patch) return None return patch Should just be a loop. Which attempts to grab the pathc, if it can't, tries again,until next_work_item returns None. The only downside of that is that we'll end up blowing out the queue if bugzilla ever goes down. But I don't think we should optimize for that case. We could also add a check her to make sure bugzilla is reachable before attempting any of this. :) 720457 13 164074 szledan 2012-09-14 02:11:35 -0700 Created attachment 164074 patch 720474 14 galpeter 2012-09-14 02:31:42 -0700 LGTM 720741 15 164074 eric 2012-09-14 07:23:24 -0700 Comment on attachment 164074 patch Can we write a unittest? 721067 16 164074 abarth 2012-09-14 13:04:41 -0700 Comment on attachment 164074 patch This is a much better fix, thank you! Writing a unit test should be straightforward. See http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py#L154 722710 17 164540 szledan 2012-09-18 06:01:24 -0700 Created attachment 164540 patch 722810 18 164540 eric 2012-09-18 08:24:25 -0700 Comment on attachment 164540 patch Great! 722813 19 164540 webkit.review.bot 2012-09-18 08:30:04 -0700 Comment on attachment 164540 patch Clearing flags on attachment: 164540 Committed r128899: <http://trac.webkit.org/changeset/128899> 722814 20 webkit.review.bot 2012-09-18 08:30:08 -0700 All reviewed patches have been landed. Closing bug. 161268 2012-08-29 11:04:22 -0700 2012-09-14 02:11:35 -0700 Patch bug-83038-20120829200411.patch text/plain 2435 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MDE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjRkYWUwMDlkNGIwYjY4YzAwZDUzMDk3NGE2YTg5Mzgy NzQxY2M2Yi4uNDcxM2Q1NGYwYjYwOThjYTI3MzUyZTU1NzI0NGQzYmExOWZjNTM3MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTA4LTI5ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgRVdTIHNob3VsZG4ndCBzbGVlcCBpZiB0aGVyZSBhcmUgbmV3IHBhdGNoZXMgaW4g aXRzIHF1ZXVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MzAzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IERlY3Jlc2Ugc2xlZXBpbmcgdGltZSB0byAxMCBzZWNzIHVudGlsIHByb3BlciBmaXguCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L3F1ZXVlZW5naW5lLnB5OgorICAgICAg ICAoUXVldWVFbmdpbmUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvcXVl dWVlbmdpbmVfdW5pdHRlc3QucHk6CisgICAgICAgIChRdWV1ZUVuZ2luZVRlc3QudGVzdF9zbGVl cF9tZXNzYWdlKToKKwogMjAxMi0wOC0yOSAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CiAK ICAgICAgICAgVXBkYXRlIFRlc3RSdW5uZXIgQVBJIGZvciB3ZWIgbm90aWZpY2F0aW9ucwpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9xdWV1ZWVuZ2luZS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvcXVldWVlbmdpbmUucHkKaW5kZXggMWQ3 NTM1OTY3ZWI2YzVkM2IzY2RmZDNlZDVjNjYwMzAyZmUxOGIwOS4uMmY2OGY0ZjJiNTBmY2Y2ZGNh NDg4NzQwNDkyNmYzOGZhMDE1NzkzMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2JvdC9xdWV1ZWVuZ2luZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvYm90L3F1ZXVlZW5naW5lLnB5CkBAIC03Myw4ICs3Myw4IEBAIGNsYXNzIFF1ZXVlRW5naW5l OgogICAgICAgICBzZWxmLl9vdXRwdXRfdGVlID0gT3V0cHV0VGVlKCkKIAogICAgIGxvZ19kYXRl X2Zvcm1hdCA9ICIlWS0lbS0lZCAlSDolTTolUyIKLSAgICBzbGVlcF9kdXJhdGlvbl90ZXh0ID0g IjIgbWlucyIgICMgVGhpcyBjb3VsZCBiZSBnZW5lcmF0ZWQgZnJvbSBzZWNvbmRzX3RvX3NsZWVw Ci0gICAgc2Vjb25kc190b19zbGVlcCA9IDEyMAorICAgIHNsZWVwX2R1cmF0aW9uX3RleHQgPSAi MTAgc2VjcyIgICMgVGhpcyBjb3VsZCBiZSBnZW5lcmF0ZWQgZnJvbSBzZWNvbmRzX3RvX3NsZWVw CisgICAgc2Vjb25kc190b19zbGVlcCA9IDEwCiAgICAgaGFuZGxlZF9lcnJvcl9jb2RlID0gMgog CiAgICAgIyBDaGlsZCBwcm9jZXNzZXMgZXhpdCB3aXRoIGEgc3BlY2lhbCBjb2RlIHRvIHRoZSBw YXJlbnQgcXVldWUgcHJvY2VzcyBjYW4gZGV0ZWN0IHRoZSBlcnJvciB3YXMgaGFuZGxlZC4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvcXVldWVlbmdpbmVfdW5p dHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L3F1ZXVlZW5naW5lX3Vu aXR0ZXN0LnB5CmluZGV4IGY5NTllZTE0OTQzNDc3OWVhMzY1N2Q3MWIyMmFjYWE2MzFmNDA0MTgu LjNlOTkzZWViYWM4MzM3YWQ0NzQxMGMzM2I1YTNiYTY4ZDQ2M2E0YzUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvcXVldWVlbmdpbmVfdW5pdHRlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9xdWV1ZWVuZ2luZV91bml0dGVzdC5w eQpAQCAtMTczLDcgKzE3Myw3IEBAIGNsYXNzIFF1ZXVlRW5naW5lVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgZGVmIHRlc3Rfc2xlZXBfbWVzc2FnZShzZWxmKToKICAgICAgICAgZW5naW5l ID0gUXVldWVFbmdpbmUoInRlc3QiLCBOb25lLCBOb25lKQogICAgICAgICBlbmdpbmUuX25vdyA9 IGxhbWJkYTogZGF0ZXRpbWUuZGF0ZXRpbWUoMjAxMCwgMSwgMSkKLSAgICAgICAgZXhwZWN0ZWRf c2xlZXBfbWVzc2FnZSA9ICJNRVNTQUdFIFNsZWVwaW5nIHVudGlsIDIwMTAtMDEtMDEgMDA6MDI6 MDAgKDIgbWlucykuIgorICAgICAgICBleHBlY3RlZF9zbGVlcF9tZXNzYWdlID0gIk1FU1NBR0Ug U2xlZXBpbmcgdW50aWwgMjAxMC0wMS0wMSAwMDowMDoxMCAoMTAgc2VjcykuIgogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGVuZ2luZS5fc2xlZXBfbWVzc2FnZSgiTUVTU0FHRSIpLCBleHBlY3Rl ZF9zbGVlcF9tZXNzYWdlKQogCiAgICAgZGVmIHNldFVwKHNlbGYpOgo= 164074 2012-09-14 02:11:35 -0700 2012-09-18 06:01:24 -0700 patch 120914-EWS-sleep text/plain 3054 szledan ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4MThh MmUwLi44Mjg2ZDQ3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMDktMTQgIFN6aWxhcmQgTGVkYW4gIDxzemxl ZGFuQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBFV1Mgc2hvdWxkbid0IHNsZWVwIGlmIHRo ZXJlIGFyZSBuZXcgcGF0Y2hlcyBpbiBpdHMgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRVdTIHRyaWVzIHRvIHByb2Nlc3MgYSBzZWN1cml0eSBw YXRjaC4gT2YgY291cnNlIGl0IGNhbid0LCBiZWNhdXNlIHRoZSBFV1MgaXNuJ3QKKyAgICAgICAg dGhlIG1lbWJlciBvZiB0aGUgc2VjdXJpdHkgZ3JvdXAuIEJ1dCB0aGUgcHJvYmxlbSBpcyB0aGF0 IGFmdGVyIGl0IGNhbid0IHByb2Nlc3MKKyAgICAgICAgdGhlIGF0dGFjaG1lbnQsIGl0IHNheXMg dGhhdCBxdWV1ZSBpcyBlbXB0eSAoYnV0IGl0IGlzbid0ISkgYW5kIGl0IHNsZWVwcyAyIG1pbnV0 ZXMKKyAgICAgICAgYW5kIHB1c2ggdGhlIHNlY3VyaXR5IHBhdGNoIHRvIHRoZSBlbmQgb2YgdGhl IHF1ZXVlLgorICAgICAgICBOb3cgaXQgc3RheXMgaW4gdGhlIGxvb3AgdW50aWwgaXQgZmluZHMg YSBwYXRjaCBvciB0aGUgcXVldWUgZ2V0cyBlbXB0eS4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHk6CisgICAgICAgIChBYnN0cmFjdFBhdGNoUXVl dWUuX25leHRfcGF0Y2gpOgorCiAyMDEyLTA5LTEzICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhh dXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIFRoZSBBTkdMRSBidWlsZCBvbiBXaW5k b3dzIGJyZWFrcyB3aXRoIEdudVdpbjMyJ3MgZmxleCBiZWNhdXNlIGl0IGlzIHRvbyBvbGQKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5CmluZGV4IDQ3 NWU1MDVkLi42OTkzYzJkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvcXVldWVzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9xdWV1ZXMucHkKQEAgLTIwMSwxOCArMjAxLDIxIEBAIGNsYXNzIEFic3RyYWN0UGF0Y2hR dWV1ZShBYnN0cmFjdFF1ZXVlKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3Rvb2wuc3RhdHVzX3Nl cnZlci51cGRhdGVfc3RhdHVzKHNlbGYubmFtZSwgbWVzc2FnZSwgcGF0Y2gsIHJlc3VsdHNfZmls ZSkKIAogICAgIGRlZiBfbmV4dF9wYXRjaChzZWxmKToKLSAgICAgICAgcGF0Y2hfaWQgPSBzZWxm Ll90b29sLnN0YXR1c19zZXJ2ZXIubmV4dF93b3JrX2l0ZW0oc2VsZi5uYW1lKQotICAgICAgICBp ZiBub3QgcGF0Y2hfaWQ6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICBwYXRjaCA9 IHNlbGYuX3Rvb2wuYnVncy5mZXRjaF9hdHRhY2htZW50KHBhdGNoX2lkKQotICAgICAgICBpZiBu b3QgcGF0Y2g6Ci0gICAgICAgICAgICAjIEZJWE1FOiBVc2luZyBhIGZha2UgcGF0Y2ggYmVjYXVz ZSByZWxlYXNlX3dvcmtfaXRlbSBoYXMgdGhlIHdyb25nIEFQSS4KLSAgICAgICAgICAgICMgV2Ug YWxzbyBkb24ndCByZWFsbHkgbmVlZCB0byByZWxlYXNlIHRoZSBsb2NrIChhbHRob3VnaCB0aGF0 J3MgZmluZSksCi0gICAgICAgICAgICAjIG1vc3RseSB3ZSBqdXN0IG5lZWQgdG8gcmVtb3ZlIHRo aXMgYm9ndXMgcGF0Y2ggZnJvbSBvdXIgcXVldWUuCi0gICAgICAgICAgICAjIElmIGZvciBzb21l IHJlYXNvbiBidWd6aWxsYSBpcyBqdXN0IGRvd24sIHRoZW4gaXQgd2lsbCBiZSByZS1mZWQgbGF0 ZXIuCi0gICAgICAgICAgICBwYXRjaCA9IEF0dGFjaG1lbnQoeydpZCc6IHBhdGNoX2lkfSwgTm9u ZSkKLSAgICAgICAgICAgIHNlbGYuX3JlbGVhc2Vfd29ya19pdGVtKHBhdGNoKQotICAgICAgICAg ICAgcmV0dXJuIE5vbmUKKyAgICAgICAgIyBGSVhNRTogQnVnemlsbGEgYWNjZXNzaWJpbGl0eSBz aG91bGQgYmUgY2hlY2tlZCBoZXJlOyBpZiBpdCdzIHVuYWNjZXNzaWJsZSwKKyAgICAgICAgIyBp dCBzaG91bGQgcmV0dXJuIE5vbmUuCisgICAgICAgIHBhdGNoID0gTm9uZQorICAgICAgICB3aGls ZSBub3QgcGF0Y2g6CisgICAgICAgICAgICBwYXRjaF9pZCA9IHNlbGYuX3Rvb2wuc3RhdHVzX3Nl cnZlci5uZXh0X3dvcmtfaXRlbShzZWxmLm5hbWUpCisgICAgICAgICAgICBpZiBub3QgcGF0Y2hf aWQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAgICAgIHBhdGNoID0gc2Vs Zi5fdG9vbC5idWdzLmZldGNoX2F0dGFjaG1lbnQocGF0Y2hfaWQpCisgICAgICAgICAgICBpZiBu b3QgcGF0Y2g6CisgICAgICAgICAgICAgICAgIyBGSVhNRTogVXNpbmcgYSBmYWtlIHBhdGNoIGJl Y2F1c2UgcmVsZWFzZV93b3JrX2l0ZW0gaGFzIHRoZSB3cm9uZyBBUEkuCisgICAgICAgICAgICAg ICAgIyBXZSBhbHNvIGRvbid0IHJlYWxseSBuZWVkIHRvIHJlbGVhc2UgdGhlIGxvY2sgKGFsdGhv dWdoIHRoYXQncyBmaW5lKSwKKyAgICAgICAgICAgICAgICAjIG1vc3RseSB3ZSBqdXN0IG5lZWQg dG8gcmVtb3ZlIHRoaXMgYm9ndXMgcGF0Y2ggZnJvbSBvdXIgcXVldWUuCisgICAgICAgICAgICAg ICAgIyBJZiBmb3Igc29tZSByZWFzb24gYnVnemlsbGEgaXMganVzdCBkb3duLCB0aGVuIGl0IHdp bGwgYmUgcmUtZmVkIGxhdGVyLgorICAgICAgICAgICAgICAgIGZha2VfcGF0Y2ggPSBBdHRhY2ht ZW50KHsnaWQnOiBwYXRjaF9pZH0sIE5vbmUpCisgICAgICAgICAgICAgICAgc2VsZi5fcmVsZWFz ZV93b3JrX2l0ZW0oZmFrZV9wYXRjaCkKICAgICAgICAgcmV0dXJuIHBhdGNoCiAKICAgICBkZWYg X3JlbGVhc2Vfd29ya19pdGVtKHNlbGYsIHBhdGNoKToK 164540 2012-09-18 06:01:24 -0700 2012-09-18 08:30:04 -0700 patch 120918-EWS-sleep text/plain 4730 szledan ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjZGRj YTQ2Li5hNjllMDExIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDktMTggIFN6aWxhcmQgTGVkYW4gIDxzemxl ZGFuQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBFV1Mgc2hvdWxkbid0IHNsZWVwIGlmIHRo ZXJlIGFyZSBuZXcgcGF0Y2hlcyBpbiBpdHMgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRVdTIHRyaWVzIHRvIHByb2Nlc3MgYSBzZWN1cml0eSBw YXRjaC4gT2YgY291cnNlIGl0IGNhbid0LCBiZWNhdXNlIHRoZSBFV1MgaXNuJ3QKKyAgICAgICAg dGhlIG1lbWJlciBvZiB0aGUgc2VjdXJpdHkgZ3JvdXAuIEJ1dCB0aGUgcHJvYmxlbSBpcyB0aGF0 IGFmdGVyIGl0IGNhbid0IHByb2Nlc3MKKyAgICAgICAgdGhlIGF0dGFjaG1lbnQsIGl0IHNheXMg dGhhdCBxdWV1ZSBpcyBlbXB0eSAoYnV0IGl0IGlzbid0ISkgYW5kIGl0IHNsZWVwcyAyIG1pbnV0 ZXMKKyAgICAgICAgYW5kIHB1c2ggdGhlIHNlY3VyaXR5IHBhdGNoIHRvIHRoZSBlbmQgb2YgdGhl IHF1ZXVlLgorICAgICAgICBOb3cgaXQgc3RheXMgaW4gdGhlIGxvb3AgdW50aWwgaXQgZmluZHMg YSBwYXRjaCBvciB0aGUgcXVldWUgZ2V0cyBlbXB0eS4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHk6CisgICAgICAgIChBYnN0cmFjdFBhdGNoUXVl dWUuX25leHRfcGF0Y2gpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9xdWV1ZXNfdW5pdHRlc3QucHk6CisgICAgICAgIChBYnN0cmFjdFBhdGNoUXVldWVUZXN0LnRl c3RfbmV4dF9wYXRjaCk6CisKIDIwMTItMDktMTggIFNlb2tqdSBLd29uICA8c2Vva2p1Lmt3b25A c2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gUmVtb3ZlIGJhY2tncm91bmQgdmlldyBvbiBF V2ViTGF1bmNoZXIgYW5kIE1pbmlCcm93c2VyCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL3F1ZXVlcy5weQppbmRleCA0NzVlNTA1ZC4uNjk5M2MyZCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5CkBAIC0yMDEsMTgg KzIwMSwyMSBAQCBjbGFzcyBBYnN0cmFjdFBhdGNoUXVldWUoQWJzdHJhY3RRdWV1ZSk6CiAgICAg ICAgIHJldHVybiBzZWxmLl90b29sLnN0YXR1c19zZXJ2ZXIudXBkYXRlX3N0YXR1cyhzZWxmLm5h bWUsIG1lc3NhZ2UsIHBhdGNoLCByZXN1bHRzX2ZpbGUpCiAKICAgICBkZWYgX25leHRfcGF0Y2go c2VsZik6Ci0gICAgICAgIHBhdGNoX2lkID0gc2VsZi5fdG9vbC5zdGF0dXNfc2VydmVyLm5leHRf d29ya19pdGVtKHNlbGYubmFtZSkKLSAgICAgICAgaWYgbm90IHBhdGNoX2lkOgotICAgICAgICAg ICAgcmV0dXJuIE5vbmUKLSAgICAgICAgcGF0Y2ggPSBzZWxmLl90b29sLmJ1Z3MuZmV0Y2hfYXR0 YWNobWVudChwYXRjaF9pZCkKLSAgICAgICAgaWYgbm90IHBhdGNoOgotICAgICAgICAgICAgIyBG SVhNRTogVXNpbmcgYSBmYWtlIHBhdGNoIGJlY2F1c2UgcmVsZWFzZV93b3JrX2l0ZW0gaGFzIHRo ZSB3cm9uZyBBUEkuCi0gICAgICAgICAgICAjIFdlIGFsc28gZG9uJ3QgcmVhbGx5IG5lZWQgdG8g cmVsZWFzZSB0aGUgbG9jayAoYWx0aG91Z2ggdGhhdCdzIGZpbmUpLAotICAgICAgICAgICAgIyBt b3N0bHkgd2UganVzdCBuZWVkIHRvIHJlbW92ZSB0aGlzIGJvZ3VzIHBhdGNoIGZyb20gb3VyIHF1 ZXVlLgotICAgICAgICAgICAgIyBJZiBmb3Igc29tZSByZWFzb24gYnVnemlsbGEgaXMganVzdCBk b3duLCB0aGVuIGl0IHdpbGwgYmUgcmUtZmVkIGxhdGVyLgotICAgICAgICAgICAgcGF0Y2ggPSBB dHRhY2htZW50KHsnaWQnOiBwYXRjaF9pZH0sIE5vbmUpCi0gICAgICAgICAgICBzZWxmLl9yZWxl YXNlX3dvcmtfaXRlbShwYXRjaCkKLSAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgICMg RklYTUU6IEJ1Z3ppbGxhIGFjY2Vzc2liaWxpdHkgc2hvdWxkIGJlIGNoZWNrZWQgaGVyZTsgaWYg aXQncyB1bmFjY2Vzc2libGUsCisgICAgICAgICMgaXQgc2hvdWxkIHJldHVybiBOb25lLgorICAg ICAgICBwYXRjaCA9IE5vbmUKKyAgICAgICAgd2hpbGUgbm90IHBhdGNoOgorICAgICAgICAgICAg cGF0Y2hfaWQgPSBzZWxmLl90b29sLnN0YXR1c19zZXJ2ZXIubmV4dF93b3JrX2l0ZW0oc2VsZi5u YW1lKQorICAgICAgICAgICAgaWYgbm90IHBhdGNoX2lkOgorICAgICAgICAgICAgICAgIHJldHVy biBOb25lCisgICAgICAgICAgICBwYXRjaCA9IHNlbGYuX3Rvb2wuYnVncy5mZXRjaF9hdHRhY2ht ZW50KHBhdGNoX2lkKQorICAgICAgICAgICAgaWYgbm90IHBhdGNoOgorICAgICAgICAgICAgICAg ICMgRklYTUU6IFVzaW5nIGEgZmFrZSBwYXRjaCBiZWNhdXNlIHJlbGVhc2Vfd29ya19pdGVtIGhh cyB0aGUgd3JvbmcgQVBJLgorICAgICAgICAgICAgICAgICMgV2UgYWxzbyBkb24ndCByZWFsbHkg bmVlZCB0byByZWxlYXNlIHRoZSBsb2NrIChhbHRob3VnaCB0aGF0J3MgZmluZSksCisgICAgICAg ICAgICAgICAgIyBtb3N0bHkgd2UganVzdCBuZWVkIHRvIHJlbW92ZSB0aGlzIGJvZ3VzIHBhdGNo IGZyb20gb3VyIHF1ZXVlLgorICAgICAgICAgICAgICAgICMgSWYgZm9yIHNvbWUgcmVhc29uIGJ1 Z3ppbGxhIGlzIGp1c3QgZG93biwgdGhlbiBpdCB3aWxsIGJlIHJlLWZlZCBsYXRlci4KKyAgICAg ICAgICAgICAgICBmYWtlX3BhdGNoID0gQXR0YWNobWVudCh7J2lkJzogcGF0Y2hfaWR9LCBOb25l KQorICAgICAgICAgICAgICAgIHNlbGYuX3JlbGVhc2Vfd29ya19pdGVtKGZha2VfcGF0Y2gpCiAg ICAgICAgIHJldHVybiBwYXRjaAogCiAgICAgZGVmIF9yZWxlYXNlX3dvcmtfaXRlbShzZWxmLCBw YXRjaCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv cXVldWVzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L3F1ZXVlc191bml0dGVzdC5weQppbmRleCAzNDVmMjA2Li5iMjI0MzU2IDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXNfdW5pdHRlc3Qu cHkKQEAgLTE1OCwxMiArMTU4LDE0IEBAIGNsYXNzIEFic3RyYWN0UGF0Y2hRdWV1ZVRlc3QoQ29t bWFuZHNUZXN0KToKICAgICAgICAgcXVldWUuX29wdGlvbnMgPSBNb2NrKCkKICAgICAgICAgcXVl dWUuX29wdGlvbnMucG9ydCA9IE5vbmUKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocXVldWUu X25leHRfcGF0Y2goKSwgTm9uZSkKLSAgICAgICAgdG9vbC5zdGF0dXNfc2VydmVyID0gTW9ja1N0 YXR1c1NlcnZlcih3b3JrX2l0ZW1zPVsyLCAxMDAwMF0pCisgICAgICAgIHRvb2wuc3RhdHVzX3Nl cnZlciA9IE1vY2tTdGF0dXNTZXJ2ZXIod29ya19pdGVtcz1bMiwgMTAwMDAsIDEwMDAxXSkKICAg ICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIk1PQ0s6IGZldGNoX2F0dGFjaG1lbnQ6IDIgaXMgbm90 IGEga25vd24gYXR0YWNobWVudCBpZFxuIiAgIyBBIG1vY2stb25seSBtZXNzYWdlIHRvIHByZXZl bnQgdXMgZnJvbSBtYWtpbmcgbWlzdGFrZXMuCiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJN T0NLOiByZWxlYXNlX3dvcmtfaXRlbTogTm9uZSAyXG4iCi0gICAgICAgIHBhdGNoX2lkID0gT3V0 cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHF1ZXVlLl9uZXh0X3BhdGNoLCBleHBl Y3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0LCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3Rk ZXJyKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwYXRjaF9pZCwgTm9uZSkgICMgMiBpcyBh biBpbnZhbGlkIHBhdGNoIGlkCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHF1ZXVlLl9uZXh0 X3BhdGNoKCkuaWQoKSwgMTAwMDApCisgICAgICAgIHBhdGNoID0gT3V0cHV0Q2FwdHVyZSgpLmFz c2VydF9vdXRwdXRzKHNlbGYsIHF1ZXVlLl9uZXh0X3BhdGNoLCBleHBlY3RlZF9zdGRvdXQ9ZXhw ZWN0ZWRfc3Rkb3V0LCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQorICAgICAgICAj IFRoZSBwYXRjaC5pZCgpID09IDIgaXMgaWdub3JlZCBiZWNhdXNlIGl0IGRvZXNuJ3QgZXhpc3Qu CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBhdGNoLmlkKCksIDEwMDAwKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhxdWV1ZS5fbmV4dF9wYXRjaCgpLmlkKCksIDEwMDAxKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhxdWV1ZS5fbmV4dF9wYXRjaCgpLCBOb25lKSAgICAjIFdoZW4g dGhlIHF1ZXVlIGlzIGVtcHR5CiAKICAgICBkZWYgdGVzdF91cGxvYWRfcmVzdWx0c19hcmNoaXZl X2Zvcl9wYXRjaChzZWxmKToKICAgICAgICAgcXVldWUgPSBBYnN0cmFjdFBhdGNoUXVldWUoKQo=