<!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>[12326] CalendarServer/branches/users/gaya/cleanrevisions</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/12326">12326</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-01-13 12:58:02 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>patch instead of using config.RescheduleRevisionWork to stop rescheduling in test cases</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstwistedcaldavstdconfigpy">CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworkrevision_cleanuppy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworktesttest_revision_cleanuppy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayacleanrevisionstwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py (12325 => 12326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py 2014-01-13 19:02:16 UTC (rev 12325)
+++ CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py 2014-01-13 20:58:02 UTC (rev 12326)
</span><span class="lines">@@ -634,7 +634,6 @@
</span><span class="cx">
</span><span class="cx"> "SyncTokenLifetimeDays" : 14, # Number of days that a client sync report token is valid
</span><span class="cx"> "RevisionCleanupPeriodDays" : 2, # Number of days between revision cleanups
</span><del>- "RescheduleRevisionWork" : True, # automatically reschedule revision work
</del><span class="cx">
</span><span class="cx"> # CardDAV Features
</span><span class="cx"> "DirectoryAddressBook": {
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py (12325 => 12326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py 2014-01-13 19:02:16 UTC (rev 12325)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py 2014-01-13 20:58:02 UTC (rev 12326)
</span><span class="lines">@@ -37,7 +37,16 @@
</span><span class="cx">
</span><span class="cx"> group = "find_min_revision"
</span><span class="cx">
</span><ins>+ @classmethod
</ins><span class="cx"> @inlineCallbacks
</span><ins>+ def _schedule(cls, txn, seconds):
+ notBefore = datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds)
+ log.debug("Scheduling find minimum valid revision work: %s" % (notBefore,))
+ wp = yield txn.enqueue(cls, notBefore=notBefore)
+ returnValue(wp)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def doWork(self):
</span><span class="cx">
</span><span class="cx"> # Delete all other work items
</span><span class="lines">@@ -82,18 +91,15 @@
</span><span class="cx"> Where=cs.NAME == "MIN-VALID-REVISION",
</span><span class="cx"> ).on(self.transaction)
</span><span class="cx">
</span><del>- if config.RescheduleRevisionWork:
- # Schedule revision cleanup
- log.debug("Scheduling revision cleanup now")
- yield self.transaction.enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</del><ins>+ # Schedule revision cleanup
+ yield RevisionCleanupWork._schedule(self.transaction, seconds=0)
</ins><span class="cx">
</span><del>- elif config.RescheduleRevisionWork:
- # Schedule next update
- notBefore = (datetime.datetime.utcnow() +
- datetime.timedelta(days=float(config.RevisionCleanupPeriodDays)))
- log.debug("Rescheduling find minimum valid revision work: %s" % (notBefore,))
- yield self.transaction.enqueue(FindMinValidRevisionWork,
- notBefore=notBefore)
</del><ins>+ else:
+ # Schedule next check
+ yield FindMinValidRevisionWork._schedule(
+ self.transaction,
+ float(config.RevisionCleanupPeriodDays) * 24 * 60 * 60
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -102,7 +108,16 @@
</span><span class="cx">
</span><span class="cx"> group = "group_revsion_cleanup"
</span><span class="cx">
</span><ins>+ @classmethod
</ins><span class="cx"> @inlineCallbacks
</span><ins>+ def _schedule(cls, txn, seconds):
+ notBefore = datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds)
+ log.debug("Scheduling revision cleanup work: %s" % (notBefore,))
+ wp = yield txn.enqueue(cls, notBefore=notBefore)
+ returnValue(wp)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def doWork(self):
</span><span class="cx">
</span><span class="cx"> # Delete all other work items
</span><span class="lines">@@ -120,19 +135,16 @@
</span><span class="cx"> yield deleteRevisionsBefore(self.transaction, minValidRevision)
</span><span class="cx">
</span><span class="cx"> # Schedule next update
</span><del>- if config.RescheduleRevisionWork:
- notBefore = (datetime.datetime.utcnow() +
- datetime.timedelta(days=float(config.RevisionCleanupPeriodDays)))
- log.debug("Rescheduling find minimum valid revision work: %s" % (notBefore,))
- yield self.transaction.enqueue(FindMinValidRevisionWork, notBefore=notBefore)
</del><ins>+ yield FindMinValidRevisionWork._schedule(
+ self.transaction,
+ float(config.RevisionCleanupPeriodDays) * 24 * 60 * 60
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def scheduleFirstFindMinRevision(store, seconds):
</span><span class="cx"> txn = store.newTransaction()
</span><del>- notBefore = datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds)
- log.debug("Scheduling first find minimum valid revision work: %s" % (notBefore,))
- wp = (yield txn.enqueue(FindMinValidRevisionWork, notBefore=notBefore))
</del><ins>+ wp = yield FindMinValidRevisionWork._schedule(txn, seconds)
</ins><span class="cx"> yield txn.commit()
</span><span class="cx"> returnValue(wp)
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworktesttest_revision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py (12325 => 12326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py 2014-01-13 19:02:16 UTC (rev 12325)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py 2014-01-13 20:58:02 UTC (rev 12326)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.dal.syntax import Select
</span><ins>+from twext.enterprise.queue import WorkItem
</ins><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="lines">@@ -28,7 +29,14 @@
</span><span class="cx"> from txdav.common.icommondatastore import SyncTokenValidException
</span><span class="cx"> import datetime
</span><span class="cx">
</span><ins>+class FakeWork(WorkItem):
</ins><span class="cx">
</span><ins>+ @classmethod
+ def _schedule(cls, txn, seconds):
+ pass
+
+
+
</ins><span class="cx"> class RevisionCleanupTests(CommonCommonTests, TestCase):
</span><span class="cx"> """
</span><span class="cx"> Test store-based address book sharing.
</span><span class="lines">@@ -40,7 +48,8 @@
</span><span class="cx"> self._sqlStore = yield buildStore(self, self.notifierFactory)
</span><span class="cx"> yield self.populate()
</span><span class="cx"> self.patch(config, "SyncTokenLifetimeDays", 0)
</span><del>- self.patch(config, "RescheduleRevisionWork", False)
</del><ins>+ self.patch(FindMinValidRevisionWork, "_schedule", FakeWork._schedule)
+ self.patch(RevisionCleanupWork, "_schedule", FakeWork._schedule)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre>
</div>
</div>
</body>
</html>