<!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>[8033] CalendarServer/trunk/txdav</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.macosforge.org/projects/calendarserver/changeset/8033">8033</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2011-08-31 09:55:38 -0700 (Wed, 31 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle arbitrary exceptions during migration by logging the error and continuing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretestcommonpy">CalendarServer/trunk/txdav/caldav/datastore/test/common.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreutilpy">CalendarServer/trunk/txdav/caldav/datastore/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoreutilpy">CalendarServer/trunk/txdav/carddav/datastore/util.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/</li>
<li>CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/</li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretestcalendar_storehomehome_badcalendar_bad1ics">CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/1.ics</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretestcalendar_storehomehome_badcalendar_bad2ics">CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/2.ics</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoretestcalendar_storehomehome_badcalendar_bad1ics"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/1.ics (0 => 8033)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/1.ics (rev 0)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/1.ics 2011-08-31 16:55:38 UTC (rev 8033)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.1//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:US/Pacific
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+DTSTART:20070311T020000
+TZNAME:PDT
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+DTSTART:20071104T020000
+TZNAME:PST
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTEND;TZID=US/Pacific:20070324T124500
+UID:uid1
+DTSTAMP:20090326T145447Z
+SUMMARY:Busted
+DTSTART;TZID=US/Pacific:20070324T121500
+CREATED:20090326T145440Z
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretestcalendar_storehomehome_badcalendar_bad2ics"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/2.ics (0 => 8033)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/2.ics (rev 0)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/2.ics 2011-08-31 16:55:38 UTC (rev 8033)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:uid2
+DTSTART;TZID=US/Eastern:20060102T140000
+DURATION:PT1H
+CREATED:20060102T190000Z
+DTSTAMP:20051222T210507Z
+RRULE:FREQ=DAILY;COUNT=5
+SUMMARY:event 6-%ctr
+END:VEVENT
+BEGIN:VEVENT
+UID:uid2
+RECURRENCE-ID;TZID=US/Eastern:20060104T140000
+DTSTART;TZID=US/Eastern:20060104T160000
+DURATION:PT1H
+CREATED:20060102T190000Z
+DESCRIPTION:Some notes
+DTSTAMP:20051222T210507Z
+SUMMARY:event 6-%ctr changed again
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+X-MULBERRY-ALARM-STATUS:PENDING
+X-MULBERRY-SPEAK-TEXT:
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretestcommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/common.py (8032 => 8033)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/common.py 2011-08-30 18:45:44 UTC (rev 8032)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/common.py 2011-08-31 16:55:38 UTC (rev 8033)
</span><span class="lines">@@ -1854,6 +1854,7 @@
</span><span class="cx"> uid for uid in self.requirements
</span><span class="cx"> if self.requirements[uid] is not None
</span><span class="cx"> ])
</span><ins>+ additionalUIDs.add("home_bad")
</ins><span class="cx"> expectedUIDs = additionalUIDs.union(requiredUIDs)
</span><span class="cx"> self.assertEquals(foundUIDs, expectedUIDs)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (8032 => 8033)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2011-08-30 18:45:44 UTC (rev 8032)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2011-08-31 16:55:38 UTC (rev 8033)
</span><span class="lines">@@ -153,6 +153,23 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_migrateBadCalendarFromFile(self):
+ """
+ C{_migrateCalendar()} can migrate a file-backed calendar to a database-
+ backed calendar.
+ """
+ fromCalendar = yield (yield self.fileTransaction().calendarHomeWithUID(
+ "home_bad")).calendarWithName("calendar_bad")
+ toHome = yield self.transactionUnderTest().calendarHomeWithUID(
+ "new-home", create=True)
+ toCalendar = yield toHome.calendarWithName("calendar")
+ ok, bad = (yield _migrateCalendar(fromCalendar, toCalendar,
+ lambda x: x.component()))
+ self.assertEqual(ok, 1)
+ self.assertEqual(bad, 1)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_migrateHomeFromFile(self):
</span><span class="cx"> """
</span><span class="cx"> L{migrateHome} will migrate an L{ICalendarHome} provider from one
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py (8032 => 8033)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/util.py 2011-08-30 18:45:44 UTC (rev 8032)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py 2011-08-31 16:55:38 UTC (rev 8033)
</span><span class="lines">@@ -129,8 +129,11 @@
</span><span class="cx"> @param outCalendar: the L{ICalendar} to store calendar objects to.
</span><span class="cx"> @param getComponent: a 1-argument callable; see L{migrateHome}.
</span><span class="cx">
</span><del>- @return: a L{Deferred} which fires when the calendar has migrated.
</del><ins>+ @return: a tuple of (ok count, bad count)
</ins><span class="cx"> """
</span><ins>+
+ ok_count = 0
+ bad_count = 0
</ins><span class="cx"> outCalendar.properties().update(inCalendar.properties())
</span><span class="cx"> for calendarObject in (yield inCalendar.calendarObjects()):
</span><span class="cx">
</span><span class="lines">@@ -164,15 +167,27 @@
</span><span class="cx"> proto =_AttachmentMigrationProto(transport)
</span><span class="cx"> attachment.retrieve(proto)
</span><span class="cx"> yield proto.done
</span><ins>+
+ ok_count += 1
</ins><span class="cx">
</span><span class="cx"> except InternalDataStoreError:
</span><del>- log.error(" Failed to migrate calendar object: %s/%s/%s" % (
</del><ins>+ log.error(" InternalDataStoreError: Failed to migrate calendar object: %s/%s/%s" % (
</ins><span class="cx"> inCalendar.ownerHome().name(),
</span><span class="cx"> inCalendar.name(),
</span><span class="cx"> calendarObject.name(),
</span><span class="cx"> ))
</span><ins>+ bad_count += 1
</ins><span class="cx">
</span><ins>+ except Exception, e:
+ log.error(" %s: Failed to migrate calendar object: %s/%s/%s" % (
+ str(e),
+ inCalendar.ownerHome().name(),
+ inCalendar.name(),
+ calendarObject.name(),
+ ))
+ bad_count += 1
</ins><span class="cx">
</span><ins>+ returnValue((ok_count, bad_count,))
</ins><span class="cx">
</span><span class="cx"> class _AttachmentMigrationProto(Protocol, object):
</span><span class="cx"> def __init__(self, storeTransport):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastoreutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/util.py (8032 => 8033)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/util.py 2011-08-30 18:45:44 UTC (rev 8032)
+++ CalendarServer/trunk/txdav/carddav/datastore/util.py 2011-08-31 16:55:38 UTC (rev 8033)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> """
</span><span class="cx"> Utility logic common to multiple backend implementations.
</span><span class="cx"> """
</span><del>-from twisted.internet.defer import inlineCallbacks
</del><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.vcard import Component as VCard
</span><span class="cx"> from twistedcaldav.vcard import InvalidVCardDataError
</span><span class="lines">@@ -76,6 +76,9 @@
</span><span class="cx"> @param outAddressbook: the L{IAddressbook} to store addressbook objects to.
</span><span class="cx"> @param getComponent: a 1-argument callable; see L{migrateHome}.
</span><span class="cx"> """
</span><ins>+
+ ok_count = 0
+ bad_count = 0
</ins><span class="cx"> outAddressbook.properties().update(inAddressbook.properties())
</span><span class="cx"> inObjects = yield inAddressbook.addressbookObjects()
</span><span class="cx"> for addressbookObject in inObjects:
</span><span class="lines">@@ -95,16 +98,28 @@
</span><span class="cx"> if outAddressbook.objectResourcesHaveProperties():
</span><span class="cx"> outObject.properties().update(addressbookObject.properties())
</span><span class="cx">
</span><ins>+ ok_count += 1
</ins><span class="cx">
</span><span class="cx"> except InternalDataStoreError:
</span><del>- log.error(" Failed to migrate adress book object: %s/%s/%s" % (
</del><ins>+ log.error(" InternalDataStoreError: Failed to migrate address book object: %s/%s/%s" % (
</ins><span class="cx"> inAddressbook.ownerHome().name(),
</span><span class="cx"> inAddressbook.name(),
</span><span class="cx"> addressbookObject.name(),
</span><span class="cx"> ))
</span><ins>+ bad_count += 1
</ins><span class="cx">
</span><ins>+ except Exception, e:
+ log.error(" %s: Failed to migrate address book object: %s/%s/%s" % (
+ str(e),
+ inAddressbook.ownerHome().name(),
+ inAddressbook.name(),
+ addressbookObject.name(),
+ ))
+ bad_count += 1
</ins><span class="cx">
</span><ins>+ returnValue((ok_count, bad_count,))
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def migrateHome(inHome, outHome, getComponent=lambda x:x.component()):
</span><span class="cx"> yield outHome.removeAddressBookWithName("addressbook")
</span></span></pre>
</div>
</div>
</body>
</html>