<!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>[14897] CalendarServer/trunk</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/14897">14897</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-17 09:23:36 -0700 (Wed, 17 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add some revision clean-up controlapi for debugging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavcontrolapipy">CalendarServer/trunk/twistedcaldav/controlapi.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavcontrolapipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/controlapi.py (14896 => 14897)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/controlapi.py 2015-06-16 20:37:37 UTC (rev 14896)
+++ CalendarServer/trunk/twistedcaldav/controlapi.py 2015-06-17 16:23:36 UTC (rev 14897)
</span><span class="lines">@@ -352,3 +352,22 @@
</span><span class="cx"> ))
</span><span class="cx">
</span><span class="cx"> returnValue(self._ok("ok", "Scheduling done"))
</span><ins>+
+
+ @inlineCallbacks
+ def action_revisioncleanup(self, j):
+ """
+ Wait for all schedule queue items to complete.
+ """
+ from txdav.common.datastore.work.revision_cleanup import _triggerRevisionCleanup
+ from txdav.common.datastore.work.revision_cleanup import RevisionCleanupWork
+
+ txn = self._store.newTransaction()
+ yield _triggerRevisionCleanup(txn, 60)
+ yield txn.commit()
+
+ yield JobItem.waitWorkDone(self._store.newTransaction, reactor, 120.0, (
+ RevisionCleanupWork,
+ ))
+
+ returnValue(self._ok("ok", "RevisionCleanupWork done"))
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py (14896 => 14897)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py 2015-06-16 20:37:37 UTC (rev 14896)
+++ CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py 2015-06-17 16:23:36 UTC (rev 14897)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> if maxRevOlderThanDate > minValidRevision:
</span><span class="cx"> # save new min valid revision
</span><del>- yield self.transaction.updateCalendarserverValue("MIN-VALID-REVISION", maxRevOlderThanDate)
</del><ins>+ yield self.transaction.updateCalendarserverValue("MIN-VALID-REVISION", maxRevOlderThanDate + 1)
</ins><span class="cx">
</span><span class="cx"> # Schedule revision cleanup
</span><span class="cx"> yield RevisionCleanupWork.reschedule(self.transaction, seconds=0)
</span><span class="lines">@@ -105,3 +105,42 @@
</span><span class="cx">
</span><span class="cx"> # delete revisions
</span><span class="cx"> yield self.transaction.deleteRevisionsBefore(minValidRevision)
</span><ins>+
+
+
+@inlineCallbacks
+def _triggerRevisionCleanup(txn, backSeconds):
+ # Get the minimum valid revision
+ minValidRevision = int((yield txn.calendarserverValue("MIN-VALID-REVISION")))
+
+ # get max revision on table rows before dateLimit
+ dateLimit = (
+ datetime.datetime.utcnow() -
+ datetime.timedelta(seconds=backSeconds)
+ )
+ maxRevOlderThanDate = 0
+
+ # TODO: Use one Select statement
+ for table in (
+ schema.CALENDAR_OBJECT_REVISIONS,
+ schema.NOTIFICATION_OBJECT_REVISIONS,
+ schema.ADDRESSBOOK_OBJECT_REVISIONS,
+ schema.ABO_MEMBERS,
+ ):
+ revisionRows = yield Select(
+ [Max(table.REVISION)],
+ From=table,
+ Where=(table.MODIFIED < dateLimit),
+ ).on(txn)
+
+ if revisionRows:
+ tableMaxRevision = revisionRows[0][0]
+ if tableMaxRevision > maxRevOlderThanDate:
+ maxRevOlderThanDate = tableMaxRevision
+
+ if maxRevOlderThanDate > minValidRevision:
+ # save new min valid revision
+ yield txn.updateCalendarserverValue("MIN-VALID-REVISION", maxRevOlderThanDate + 1)
+
+ # Schedule revision cleanup
+ yield RevisionCleanupWork.reschedule(txn, seconds=0)
</ins></span></pre>
</div>
</div>
</body>
</html>