<!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>[12030] 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/12030">12030</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-03 19:47:41 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Return a 503 response when a DB lock times out.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextenterpriselockingpy">CalendarServer/trunk/twext/enterprise/locking.py</a></li>
<li><a href="#CalendarServertrunktwextenterprisetesttest_lockingpy">CalendarServer/trunk/twext/enterprise/test/test_locking.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_wrappingpy">CalendarServer/trunk/twistedcaldav/test/test_wrapping.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwextenterpriselockingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/enterprise/locking.py (12029 => 12030)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/enterprise/locking.py 2013-12-04 03:43:03 UTC (rev 12029)
+++ CalendarServer/trunk/twext/enterprise/locking.py 2013-12-04 03:47:41 UTC (rev 12030)
</span><span class="lines">@@ -35,6 +35,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class LockTimeout(Exception):
+ """
+ The lock you were trying to lock was already locked causing a timeout.
+ """
+
+
+
</ins><span class="cx"> def makeLockSchema(inSchema):
</span><span class="cx"> """
</span><span class="cx"> Create a self-contained schema just for L{Locker} use, in C{inSchema}.
</span><span class="lines">@@ -57,7 +64,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class NamedLock(Record, fromTable(LockSchema.NAMED_LOCK)):
</span><span class="cx"> """
</span><span class="cx"> An L{AcquiredLock} lock against a shared data store that the current
</span><span class="lines">@@ -79,7 +85,9 @@
</span><span class="cx"> def autoRelease(self):
</span><span class="cx"> txn.preCommit(lambda: self.release(True))
</span><span class="cx"> return self
</span><del>- return cls.create(txn, lockName=name).addCallback(autoRelease)
</del><ins>+ def lockFailed(f):
+ raise LockTimeout(name)
+ return cls.create(txn, lockName=name).addCallback(autoRelease).addErrback(lockFailed)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def release(self, ignoreAlreadyUnlocked=False):
</span><span class="lines">@@ -98,6 +106,3 @@
</span><span class="cx"> unlocked.
</span><span class="cx"> """
</span><span class="cx"> return self.delete()
</span><del>-
-
-
</del></span></pre></div>
<a id="CalendarServertrunktwextenterprisetesttest_lockingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/enterprise/test/test_locking.py (12029 => 12030)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/enterprise/test/test_locking.py 2013-12-04 03:43:03 UTC (rev 12029)
+++ CalendarServer/trunk/twext/enterprise/test/test_locking.py 2013-12-04 03:47:41 UTC (rev 12030)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.fixtures import buildConnectionPool
</span><del>-from twext.enterprise.locking import NamedLock
</del><ins>+from twext.enterprise.locking import NamedLock, LockTimeout
</ins><span class="cx"> from twext.enterprise.dal.syntax import Select
</span><span class="cx"> from twext.enterprise.locking import LockSchema
</span><span class="cx">
</span><span class="lines">@@ -76,3 +76,17 @@
</span><span class="cx"> txn2 = self.pool.connection()
</span><span class="cx"> rows = yield Select(From=LockSchema.NAMED_LOCK).on(txn2)
</span><span class="cx"> self.assertEquals(rows, [])
</span><ins>+
+
+ @inlineCallbacks
+ def test_timeout(self):
+ """
+ Trying to acquire second lock times out.
+ """
+ txn1 = self.pool.connection()
+ yield NamedLock.acquire(txn1, u"a test lock")
+
+ txn2 = self.pool.connection()
+ yield self.assertFailure(NamedLock.acquire(txn2, u"a test lock"), LockTimeout)
+ yield txn2.abort()
+ self.flushLoggedErrors()
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (12029 => 12030)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2013-12-04 03:43:03 UTC (rev 12029)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2013-12-04 03:47:41 UTC (rev 12030)
</span><span class="lines">@@ -17,7 +17,9 @@
</span><span class="cx">
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx">
</span><ins>+from twext.enterprise.locking import LockTimeout
</ins><span class="cx"> from twext.python.log import Logger
</span><ins>+from twext.web2 import responsecode, http_headers, http
</ins><span class="cx"> from twext.web2.dav.http import ErrorResponse, ResponseQueue, MultiStatusResponse
</span><span class="cx"> from twext.web2.dav.noneprops import NonePropertyStore
</span><span class="cx"> from twext.web2.dav.resource import TwistedACLInheritable, AccessDeniedError, \
</span><span class="lines">@@ -26,6 +28,7 @@
</span><span class="cx"> from twext.web2.filter.location import addLocation
</span><span class="cx"> from twext.web2.http import HTTPError, StatusResponse, Response
</span><span class="cx"> from twext.web2.http_headers import ETag, MimeType, MimeDisposition
</span><ins>+from twext.web2.iweb import IResponse
</ins><span class="cx"> from twext.web2.responsecode import \
</span><span class="cx"> FORBIDDEN, NO_CONTENT, NOT_FOUND, CREATED, CONFLICT, PRECONDITION_FAILED, \
</span><span class="cx"> BAD_REQUEST, OK, INSUFFICIENT_STORAGE_SPACE, SERVICE_UNAVAILABLE
</span><span class="lines">@@ -41,14 +44,20 @@
</span><span class="cx"> MaxInstances, NoUIDConflict
</span><span class="cx"> from twistedcaldav.carddavxml import carddav_namespace, NoUIDConflict as NovCardUIDConflict
</span><span class="cx"> from twistedcaldav.config import config
</span><ins>+from twistedcaldav.customxml import calendarserver_namespace
</ins><span class="cx"> from twistedcaldav.directory.wiki import WikiDirectoryService, getWikiAccess
</span><span class="cx"> from twistedcaldav.ical import Component as VCalendar, Property as VProperty, \
</span><span class="cx"> InvalidICalendarDataError, iCalendarProductID, Component
</span><ins>+from twistedcaldav.instance import InvalidOverriddenInstanceError, \
+ TooManyInstancesError
</ins><span class="cx"> from twistedcaldav.memcachelock import MemcacheLockTimeoutError
</span><span class="cx"> from twistedcaldav.notifications import NotificationCollectionResource, NotificationResource
</span><span class="cx"> from twistedcaldav.resource import CalDAVResource, GlobalAddressBookResource, \
</span><span class="cx"> DefaultAlarmPropertyMixin
</span><span class="cx"> from twistedcaldav.scheduling_store.caldav.resource import ScheduleInboxResource
</span><ins>+from twistedcaldav.sharing import invitationBindStatusToXMLMap, \
+ invitationBindModeToXMLMap
+from twistedcaldav.util import bestAcceptType
</ins><span class="cx"> from twistedcaldav.vcard import Component as VCard, InvalidVCardDataError
</span><span class="cx">
</span><span class="cx"> from txdav.base.propertystore.base import PropertyName
</span><span class="lines">@@ -74,19 +83,10 @@
</span><span class="cx"> from txdav.xml.base import dav_namespace, WebDAVUnknownElement, encodeXMLName
</span><span class="cx">
</span><span class="cx"> from urlparse import urlsplit, urljoin
</span><ins>+import collections
</ins><span class="cx"> import hashlib
</span><span class="cx"> import time
</span><span class="cx"> import uuid
</span><del>-from twext.web2 import responsecode, http_headers, http
-from twext.web2.iweb import IResponse
-from twistedcaldav.customxml import calendarserver_namespace
-from twistedcaldav.instance import InvalidOverriddenInstanceError, \
- TooManyInstancesError
-from twistedcaldav.util import bestAcceptType
-import collections
-from twistedcaldav.sharing import invitationBindStatusToXMLMap, \
- invitationBindModeToXMLMap
-
</del><span class="cx"> """
</span><span class="cx"> Wrappers to translate between the APIs in L{txdav.caldav.icalendarstore} and
</span><span class="cx"> L{txdav.carddav.iaddressbookstore} and those in L{twistedcaldav}.
</span><span class="lines">@@ -2291,11 +2291,53 @@
</span><span class="cx"> returnValue(response)
</span><span class="cx">
</span><span class="cx"> # The following are used to map store exceptions into HTTP error responses
</span><del>- StoreExceptionsStatusErrors = set()
</del><span class="cx"> StoreExceptionsErrors = {}
</span><del>- StoreMoveExceptionsStatusErrors = set()
</del><span class="cx"> StoreMoveExceptionsErrors = {}
</span><ins>+ StoreRemoveExceptionsErrors = {}
</ins><span class="cx">
</span><ins>+ @classmethod
+ def _storeExceptionStatus(cls, err, arg):
+ """
+ Raise a status error.
+
+ @param err: the actual exception that caused the error
+ @type err: L{Exception}
+ @param arg: description of error or C{None}
+ @type arg: C{str} or C{None}
+ """
+ raise HTTPError(StatusResponse(responsecode.FORBIDDEN, arg if arg is not None else str(err)))
+
+
+ @classmethod
+ def _storeExceptionError(cls, err, arg):
+ """
+ Raise a DAV:error error with the supplied error element.
+
+ @param err: the actual exception that caused the error
+ @type err: L{Exception}
+ @param arg: the error element
+ @type arg: C{tuple}
+ """
+ raise HTTPError(ErrorResponse(
+ responsecode.FORBIDDEN,
+ arg,
+ str(err),
+ ))
+
+
+ @classmethod
+ def _storeExceptionUnavailable(cls, err, arg):
+ """
+ Raise a service unavailable error.
+
+ @param err: the actual exception that caused the error
+ @type err: L{Exception}
+ @param arg: description of error or C{None}
+ @type arg: C{str} or C{None}
+ """
+ raise HTTPError(StatusResponse(responsecode.SERVICE_UNAVAILABLE, arg if arg is not None else str(err)))
+
+
</ins><span class="cx"> @requiresPermissions(fromParent=[davxml.Unbind()])
</span><span class="cx"> def http_DELETE(self, request):
</span><span class="cx"> """
</span><span class="lines">@@ -2387,15 +2429,9 @@
</span><span class="cx"> # Grab the current exception state here so we can use it in a re-raise - we need this because
</span><span class="cx"> # an inlineCallback might be called and that raises an exception when it returns, wiping out the
</span><span class="cx"> # original exception "context".
</span><del>- if type(err) in self.StoreMoveExceptionsStatusErrors:
- raise HTTPError(StatusResponse(responsecode.FORBIDDEN, str(err)))
-
- elif type(err) in self.StoreMoveExceptionsErrors:
- raise HTTPError(ErrorResponse(
- responsecode.FORBIDDEN,
- self.StoreMoveExceptionsErrors[type(err)],
- str(err),
- ))
</del><ins>+ if type(err) in self.StoreMoveExceptionsErrors:
+ error, arg = self.StoreMoveExceptionsErrors[type(err)]
+ error(err, arg)
</ins><span class="cx"> else:
</span><span class="cx"> # Return the original failure (exception) state
</span><span class="cx"> raise
</span><span class="lines">@@ -2438,15 +2474,9 @@
</span><span class="cx">
</span><span class="cx"> # Map store exception to HTTP errors
</span><span class="cx"> except Exception as err:
</span><del>- if type(err) in self.StoreExceptionsStatusErrors:
- raise HTTPError(StatusResponse(responsecode.FORBIDDEN, str(err)))
-
- elif type(err) in self.StoreExceptionsErrors:
- raise HTTPError(ErrorResponse(
- responsecode.FORBIDDEN,
- self.StoreExceptionsErrors[type(err)],
- str(err),
- ))
</del><ins>+ if type(err) in self.StoreExceptionsErrors:
+ error, arg = self.StoreExceptionsErrors[type(err)]
+ error(err, arg)
</ins><span class="cx"> else:
</span><span class="cx"> raise
</span><span class="cx">
</span><span class="lines">@@ -2491,6 +2521,14 @@
</span><span class="cx"> except NoSuchObjectResourceError:
</span><span class="cx"> raise HTTPError(NOT_FOUND)
</span><span class="cx">
</span><ins>+ # Map store exception to HTTP errors
+ except Exception as err:
+ if type(err) in self.StoreExceptionsErrors:
+ error, arg = self.StoreExceptionsErrors[type(err)]
+ error(err, arg)
+ else:
+ raise
+
</ins><span class="cx"> # Re-initialize to get stuff setup again now we have no object
</span><span class="cx"> self._initializeWithObject(None, self._newStoreParent)
</span><span class="cx">
</span><span class="lines">@@ -2624,51 +2662,51 @@
</span><span class="cx"> else:
</span><span class="cx"> return False
</span><span class="cx">
</span><del>- StoreExceptionsStatusErrors = set((
- ObjectResourceNameNotAllowedError,
- ObjectResourceNameAlreadyExistsError,
- ))
-
</del><span class="cx"> StoreExceptionsErrors = {
</span><del>- TooManyObjectResourcesError: customxml.MaxResources(),
- ObjectResourceTooBigError: (caldav_namespace, "max-resource-size"),
- InvalidObjectResourceError: (caldav_namespace, "valid-calendar-data"),
- InvalidComponentForStoreError: (caldav_namespace, "valid-calendar-object-resource"),
- InvalidComponentTypeError: (caldav_namespace, "supported-component"),
- TooManyAttendeesError: MaxAttendeesPerInstance.fromString(str(config.MaxAttendeesPerInstance)),
- InvalidCalendarAccessError: (calendarserver_namespace, "valid-access-restriction"),
- ValidOrganizerError: (calendarserver_namespace, "valid-organizer"),
- UIDExistsError: NoUIDConflict(),
- UIDExistsElsewhereError: (caldav_namespace, "unique-scheduling-object-resource"),
- InvalidUIDError: NoUIDConflict(),
- InvalidPerUserDataMerge: (caldav_namespace, "valid-calendar-data"),
- AttendeeAllowedError: (caldav_namespace, "attendee-allowed"),
- InvalidOverriddenInstanceError: (caldav_namespace, "valid-calendar-data"),
- TooManyInstancesError: MaxInstances.fromString(str(config.MaxAllowedInstances)),
- AttachmentStoreValidManagedID: (caldav_namespace, "valid-managed-id"),
- ShareeAllowedError: (calendarserver_namespace, "sharee-privilege-needed",),
- DuplicatePrivateCommentsError: (calendarserver_namespace, "no-duplicate-private-comments",),
</del><ins>+ ObjectResourceNameNotAllowedError: (_CommonObjectResource._storeExceptionStatus, None,),
+ ObjectResourceNameAlreadyExistsError: (_CommonObjectResource._storeExceptionStatus, None,),
+ TooManyObjectResourcesError: (_CommonObjectResource._storeExceptionError, customxml.MaxResources(),),
+ ObjectResourceTooBigError: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "max-resource-size"),),
+ InvalidObjectResourceError: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "valid-calendar-data"),),
+ InvalidComponentForStoreError: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "valid-calendar-object-resource"),),
+ InvalidComponentTypeError: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "supported-component"),),
+ TooManyAttendeesError: (_CommonObjectResource._storeExceptionError, MaxAttendeesPerInstance.fromString(str(config.MaxAttendeesPerInstance)),),
+ InvalidCalendarAccessError: (_CommonObjectResource._storeExceptionError, (calendarserver_namespace, "valid-access-restriction"),),
+ ValidOrganizerError: (_CommonObjectResource._storeExceptionError, (calendarserver_namespace, "valid-organizer"),),
+ UIDExistsError: (_CommonObjectResource._storeExceptionError, NoUIDConflict(),),
+ UIDExistsElsewhereError: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "unique-scheduling-object-resource"),),
+ InvalidUIDError: (_CommonObjectResource._storeExceptionError, NoUIDConflict(),),
+ InvalidPerUserDataMerge: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "valid-calendar-data"),),
+ AttendeeAllowedError: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "attendee-allowed"),),
+ InvalidOverriddenInstanceError: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "valid-calendar-data"),),
+ TooManyInstancesError: (_CommonObjectResource._storeExceptionError, MaxInstances.fromString(str(config.MaxAllowedInstances)),),
+ AttachmentStoreValidManagedID: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "valid-managed-id"),),
+ ShareeAllowedError: (_CommonObjectResource._storeExceptionError, (calendarserver_namespace, "sharee-privilege-needed",),),
+ DuplicatePrivateCommentsError: (_CommonObjectResource._storeExceptionError, (calendarserver_namespace, "no-duplicate-private-comments",),),
+ LockTimeout: (_CommonObjectResource._storeExceptionUnavailable, "Lock timed out.",),
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- StoreMoveExceptionsStatusErrors = set((
- ObjectResourceNameNotAllowedError,
- ObjectResourceNameAlreadyExistsError,
- ))
-
</del><span class="cx"> StoreMoveExceptionsErrors = {
</span><del>- TooManyObjectResourcesError: customxml.MaxResources(),
- InvalidResourceMove: (calendarserver_namespace, "valid-move"),
- InvalidComponentTypeError: (caldav_namespace, "supported-component"),
</del><ins>+ ObjectResourceNameNotAllowedError: (_CommonObjectResource._storeExceptionStatus, None,),
+ ObjectResourceNameAlreadyExistsError: (_CommonObjectResource._storeExceptionStatus, None,),
+ TooManyObjectResourcesError: (_CommonObjectResource._storeExceptionError, customxml.MaxResources(),),
+ InvalidResourceMove: (_CommonObjectResource._storeExceptionError, (calendarserver_namespace, "valid-move"),),
+ InvalidComponentTypeError: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "supported-component"),),
+ LockTimeout: (_CommonObjectResource._storeExceptionUnavailable, "Lock timed out.",),
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ StoreRemoveExceptionsErrors = {
+ LockTimeout: (_CommonObjectResource._storeExceptionUnavailable, "Lock timed out.",),
+ }
+
</ins><span class="cx"> StoreAttachmentValidErrors = set((
</span><span class="cx"> AttachmentStoreFailed,
</span><span class="cx"> InvalidAttachmentOperation,
</span><span class="cx"> ))
</span><span class="cx">
</span><span class="cx"> StoreAttachmentExceptionsErrors = {
</span><del>- AttachmentStoreValidManagedID: (caldav_namespace, "valid-managed-id-parameter",),
- AttachmentRemoveFailed: (caldav_namespace, "valid-attachment-remove",),
</del><ins>+ AttachmentStoreValidManagedID: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "valid-managed-id-parameter",),),
+ AttachmentRemoveFailed: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "valid-attachment-remove",),),
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2982,28 +3020,15 @@
</span><span class="cx"> except Exception as err:
</span><span class="cx">
</span><span class="cx"> if type(err) in self.StoreAttachmentValidErrors:
</span><del>- raise HTTPError(ErrorResponse(
- responsecode.FORBIDDEN,
- (caldav_namespace, valid_preconditions[action],),
- str(err),
- ))
</del><ins>+ self._storeExceptionError(err, (caldav_namespace, valid_preconditions[action],))
</ins><span class="cx">
</span><span class="cx"> elif type(err) in self.StoreAttachmentExceptionsErrors:
</span><del>- raise HTTPError(ErrorResponse(
- responsecode.FORBIDDEN,
- self.StoreAttachmentExceptionsErrors[type(err)],
- str(err),
- ))
</del><ins>+ error, arg = self.StoreAttachmentExceptionsErrors[type(err)]
+ error(err, arg)
</ins><span class="cx">
</span><del>- elif type(err) in self.StoreExceptionsStatusErrors:
- raise HTTPError(StatusResponse(responsecode.FORBIDDEN, str(err)))
-
</del><span class="cx"> elif type(err) in self.StoreExceptionsErrors:
</span><del>- raise HTTPError(ErrorResponse(
- responsecode.FORBIDDEN,
- self.StoreExceptionsErrors[type(err)],
- str(err),
- ))
</del><ins>+ error, arg = self.StoreExceptionsErrors[type(err)]
+ error(err, arg)
</ins><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> raise
</span><span class="lines">@@ -3301,32 +3326,32 @@
</span><span class="cx">
</span><span class="cx"> vCard = _CommonObjectResource.component
</span><span class="cx">
</span><del>- StoreExceptionsStatusErrors = set((
- ObjectResourceNameNotAllowedError,
- ObjectResourceNameAlreadyExistsError,
- ))
-
</del><span class="cx"> StoreExceptionsErrors = {
</span><del>- TooManyObjectResourcesError: customxml.MaxResources(),
- ObjectResourceTooBigError: (carddav_namespace, "max-resource-size"),
- InvalidObjectResourceError: (carddav_namespace, "valid-address-data"),
- InvalidComponentForStoreError: (carddav_namespace, "valid-addressbook-object-resource"),
- UIDExistsError: NovCardUIDConflict(),
- InvalidUIDError: NovCardUIDConflict(),
- InvalidPerUserDataMerge: (carddav_namespace, "valid-address-data"),
</del><ins>+ ObjectResourceNameNotAllowedError: (_CommonObjectResource._storeExceptionStatus, None,),
+ ObjectResourceNameAlreadyExistsError: (_CommonObjectResource._storeExceptionStatus, None,),
+ TooManyObjectResourcesError: (_CommonObjectResource._storeExceptionError, customxml.MaxResources(),),
+ ObjectResourceTooBigError: (_CommonObjectResource._storeExceptionError, (carddav_namespace, "max-resource-size"),),
+ InvalidObjectResourceError: (_CommonObjectResource._storeExceptionError, (carddav_namespace, "valid-address-data"),),
+ InvalidComponentForStoreError: (_CommonObjectResource._storeExceptionError, (carddav_namespace, "valid-addressbook-object-resource"),),
+ UIDExistsError: (_CommonObjectResource._storeExceptionError, NovCardUIDConflict(),),
+ InvalidUIDError: (_CommonObjectResource._storeExceptionError, NovCardUIDConflict(),),
+ InvalidPerUserDataMerge: (_CommonObjectResource._storeExceptionError, (carddav_namespace, "valid-address-data"),),
+ LockTimeout: (_CommonObjectResource._storeExceptionUnavailable, "Lock timed out.",),
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- StoreMoveExceptionsStatusErrors = set((
- ObjectResourceNameNotAllowedError,
- ObjectResourceNameAlreadyExistsError,
- ))
-
</del><span class="cx"> StoreMoveExceptionsErrors = {
</span><del>- TooManyObjectResourcesError: customxml.MaxResources(),
- InvalidResourceMove: (calendarserver_namespace, "valid-move"),
</del><ins>+ ObjectResourceNameNotAllowedError: (_CommonObjectResource._storeExceptionStatus, None,),
+ ObjectResourceNameAlreadyExistsError: (_CommonObjectResource._storeExceptionStatus, None,),
+ TooManyObjectResourcesError: (_CommonObjectResource._storeExceptionError, customxml.MaxResources(),),
+ InvalidResourceMove: (_CommonObjectResource._storeExceptionError, (calendarserver_namespace, "valid-move"),),
+ LockTimeout: (_CommonObjectResource._storeExceptionUnavailable, "Lock timed out.",),
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ StoreRemoveExceptionsErrors = {
+ LockTimeout: (_CommonObjectResource._storeExceptionUnavailable, "Lock timed out.",),
+ }
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def resourceType(self):
</span><span class="cx"> if self.isShared():
</span><span class="cx"> return customxml.ResourceType.sharedownergroup
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_wrappingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_wrapping.py (12029 => 12030)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_wrapping.py 2013-12-04 03:43:03 UTC (rev 12029)
+++ CalendarServer/trunk/twistedcaldav/test/test_wrapping.py 2013-12-04 03:47:41 UTC (rev 12030)
</span><span class="lines">@@ -19,41 +19,37 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+from twext.enterprise.ienterprise import AlreadyFinishedError
+from twext.enterprise.locking import NamedLock
+from twext.web2 import responsecode
+from twext.web2.http import HTTPError
+from twext.web2.http_headers import Headers, MimeType
+from twext.web2.responsecode import INSUFFICIENT_STORAGE_SPACE
</ins><span class="cx"> from twext.web2.responsecode import UNAUTHORIZED
</span><del>-from twext.web2.http_headers import Headers
-from twext.enterprise.ienterprise import AlreadyFinishedError
</del><ins>+from twext.web2.stream import MemoryStream
</ins><span class="cx">
</span><del>-from txdav.xml import element as davxml
-from twistedcaldav.config import config
-
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><ins>+from twisted.internet.defer import maybeDeferred
</ins><span class="cx">
</span><ins>+from twistedcaldav.config import config
+from twistedcaldav.directory.test.test_xmlfile import XMLFileBase
</ins><span class="cx"> from twistedcaldav.ical import Component as VComponent
</span><del>-from twistedcaldav.vcard import Component as VCComponent
-
</del><span class="cx"> from twistedcaldav.storebridge import DropboxCollection, \
</span><span class="cx"> CalendarCollectionResource
</span><del>-
</del><span class="cx"> from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest
</span><ins>+from twistedcaldav.vcard import Component as VCComponent
</ins><span class="cx">
</span><del>-from txdav.idav import IDataStore
</del><ins>+from txdav.caldav.datastore.file import Calendar
</ins><span class="cx"> from txdav.caldav.datastore.test.test_file import test_event_text
</span><del>-
</del><ins>+from txdav.caldav.icalendarstore import ICalendarHome
</ins><span class="cx"> from txdav.carddav.datastore.test.test_file import vcard4_text
</span><del>-
</del><ins>+from txdav.carddav.iaddressbookstore import IAddressBookHome
</ins><span class="cx"> from txdav.common.datastore.test.util import assertProvides
</span><del>-
-
-from twext.web2.http import HTTPError
-from twext.web2.responsecode import INSUFFICIENT_STORAGE_SPACE
-from twext.web2.stream import MemoryStream
</del><span class="cx"> from txdav.common.datastore.test.util import deriveQuota
</span><del>-from twistedcaldav.directory.test.test_xmlfile import XMLFileBase
-from txdav.caldav.icalendarstore import ICalendarHome
-from txdav.carddav.iaddressbookstore import IAddressBookHome
</del><ins>+from txdav.idav import IDataStore
+from txdav.xml import element as davxml
</ins><span class="cx">
</span><del>-from twisted.internet.defer import maybeDeferred
-from txdav.caldav.datastore.file import Calendar
</del><ins>+import hashlib
</ins><span class="cx">
</span><span class="cx"> def _todo(f, why):
</span><span class="cx"> f.todo = why
</span><span class="lines">@@ -560,3 +556,90 @@
</span><span class="cx"> self.requestUnderTest = None
</span><span class="cx"> yield self.assertCalendarEmpty(wsanchez)
</span><span class="cx"> yield self.assertCalendarEmpty(cdaboo)
</span><ins>+
+
+
+class TimeoutTests(StoreTestCase):
+ """
+ Tests for L{twistedcaldav.storebridge} lock timeouts.
+ """
+
+ @inlineCallbacks
+ def test_timeoutOnPUT(self):
+ """
+ PUT gets a 503 on a lock timeout.
+ """
+
+ # Create a fake lock
+ txn = self.transactionUnderTest()
+ yield NamedLock.acquire(txn, "ImplicitUIDLock:%s" % (hashlib.md5("uid1").hexdigest(),))
+
+ # PUT fails
+ request = SimpleStoreRequest(
+ self,
+ "PUT",
+ "/calendars/users/wsanchez/calendar/1.ics",
+ headers=Headers({"content-type": MimeType.fromString("text/calendar")}),
+ authid="wsanchez"
+ )
+ request.stream = MemoryStream("""BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Apple Computer\, Inc//iCal 2.0//EN
+VERSION:2.0
+BEGIN:VEVENT
+UID:uid1
+DTSTART;VALUE=DATE:20020101
+DTEND;VALUE=DATE:20020102
+DTSTAMP:20020101T121212Z
+SUMMARY:New Year's Day
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n"))
+ response = yield self.send(request)
+ self.assertEqual(response.code, responsecode.SERVICE_UNAVAILABLE)
+
+
+ @inlineCallbacks
+ def test_timeoutOnDELETE(self):
+ """
+ DELETE gets a 503 on a lock timeout.
+ """
+
+ # PUT works
+ request = SimpleStoreRequest(
+ self,
+ "PUT",
+ "/calendars/users/wsanchez/calendar/1.ics",
+ headers=Headers({"content-type": MimeType.fromString("text/calendar")}),
+ authid="wsanchez"
+ )
+ request.stream = MemoryStream("""BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Apple Computer\, Inc//iCal 2.0//EN
+VERSION:2.0
+BEGIN:VEVENT
+UID:uid1
+DTSTART;VALUE=DATE:20020101
+DTEND;VALUE=DATE:20020102
+DTSTAMP:20020101T121212Z
+ORGANIZER:mailto:wsanchez@example.com
+ATTENDEE:mailto:wsanchez@example.com
+SUMMARY:New Year's Day
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n"))
+ response = yield self.send(request)
+ self.assertEqual(response.code, responsecode.CREATED)
+
+ # Create a fake lock
+ txn = self.transactionUnderTest()
+ yield NamedLock.acquire(txn, "ImplicitUIDLock:%s" % (hashlib.md5("uid1").hexdigest(),))
+
+ request = SimpleStoreRequest(
+ self,
+ "DELETE",
+ "/calendars/users/wsanchez/calendar/1.ics",
+ authid="wsanchez"
+ )
+ response = yield self.send(request)
+ self.assertEqual(response.code, responsecode.SERVICE_UNAVAILABLE)
</ins></span></pre>
</div>
</div>
</body>
</html>