<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12736] CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12736">12736</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-02-20 12:28:50 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>InboxCleanupWork.doWork() does not enqueue more CleanupOneInboxWork if CLEANUP_ONE_INBOX_WORK rows are present. CleanupOneInboxWork.doWork() no longer does useless Delete of CLEANUP_ONE_INBOX_WORK rows with same homeID.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoreworkinbox_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcommondatastoreworkinbox_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py (12735 => 12736)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py 2014-02-20 19:55:55 UTC (rev 12735)
+++ CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py 2014-02-20 20:28:50 UTC (rev 12736)
</span><span class="lines">@@ -51,16 +51,24 @@
</span><span class="cx"> # Delete all other work items
</span><span class="cx"> yield Delete(From=self.table, Where=None).on(self.transaction)
</span><span class="cx">
</span><del>- # enumerate provisioned normal calendar homes
- ch = schema.CALENDAR_HOME
- homeRows = yield Select(
- [ch.RESOURCE_ID],
- From=ch,
- Where=ch.STATUS == _HOME_STATUS_NORMAL,
- ).on(self.transaction)
</del><ins>+ # exit if not done with last delete:
+ coiw = schema.CLEANUP_ONE_INBOX_WORK
+ rows = yield Select([coiw.HOME_ID], From=coiw,).on(self.transaction)
+ if rows:
+ homeIDs = [row[0] for row in rows]
+ log.error("Inbox cleanup work: Can't schedule per-home cleanup because work items still queued for homeIDs: {}".format(
+ homeIDs))
+ else:
+ # enumerate provisioned normal calendar homes
+ ch = schema.CALENDAR_HOME
+ homeRows = yield Select(
+ [ch.RESOURCE_ID],
+ From=ch,
+ Where=ch.STATUS == _HOME_STATUS_NORMAL,
+ ).on(self.transaction)
</ins><span class="cx">
</span><del>- for homeRow in homeRows:
- yield CleanupOneInboxWork._schedule(self.transaction, homeID=homeRow[0], seconds=0)
</del><ins>+ for homeRow in homeRows:
+ yield CleanupOneInboxWork._schedule(self.transaction, homeID=homeRow[0], seconds=0)
</ins><span class="cx">
</span><span class="cx"> # Schedule next check
</span><span class="cx"> yield self._schedule(
</span><span class="lines">@@ -88,10 +96,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def doWork(self):
</span><span class="cx">
</span><del>- # Delete all other work items for this group (for this home ID)
- yield Delete(From=self.table,
- Where=self.table.HOME_ID == self.homeID
- ).on(self.transaction)
</del><ins>+ # No need to delete other work items. They are unique
</ins><span class="cx">
</span><span class="cx"> # get orphan names
</span><span class="cx"> orphanNames = set((
</span></span></pre>
</div>
</div>
</body>
</html>