<!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>[14798] CalendarServer/trunk/twistedcaldav</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/14798">14798</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 01:30:26 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>txn time outs now generate a 503/Retry-After HTTP response rather than a 500.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_resourcepy">CalendarServer/trunk/twistedcaldav/test/test_resource.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (14797 => 14798)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2015-05-18 23:51:07 UTC (rev 14797)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2015-05-19 08:30:26 UTC (rev 14798)
</span><span class="lines">@@ -29,38 +29,17 @@
</span><span class="cx"> "isAddressBookCollectionResource",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-import hashlib
-from urlparse import urlsplit
-import urllib
-from uuid import UUID
-import uuid
</del><ins>+from calendarserver.push.notifier import getPubSubAPSConfiguration
</ins><span class="cx">
</span><ins>+from twext.enterprise.ienterprise import AlreadyFinishedError
+from twext.python.log import Logger
</ins><span class="cx">
</span><del>-from zope.interface import implements
-
</del><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
</ins><span class="cx"> from twisted.internet.defer import succeed, maybeDeferred, fail
</span><del>-from twisted.internet.defer import inlineCallbacks, returnValue
</del><span class="cx">
</span><del>-from twext.python.log import Logger
-
-from txdav.xml import element
-from txdav.xml.element import dav_namespace
-
-from txweb2 import responsecode, http, http_headers
-from txweb2.auth.wrapper import UnauthorizedResponse
-from txweb2.dav.auth import AuthenticationWrapper as SuperAuthenticationWrapper
-from txweb2.dav.idav import IDAVPrincipalCollectionResource
-from txweb2.dav.resource import AccessDeniedError, DAVPrincipalCollectionResource, \
- davPrivilegeSet
-from txweb2.dav.resource import TwistedACLInheritable
-from txweb2.dav.util import joinURL, parentForURL, normalizeURL
-from txweb2.http import HTTPError, RedirectResponse, StatusResponse, Response, JSONResponse
-from txweb2.dav.http import ErrorResponse
-from txweb2.http_headers import MimeType, ETag
-from txweb2.stream import MemoryStream
-
</del><span class="cx"> from twistedcaldav import caldavxml, customxml
</span><span class="cx"> from twistedcaldav import carddavxml
</span><ins>+from twistedcaldav import ical
</ins><span class="cx"> from twistedcaldav.cache import PropfindCacheMixin
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace
</span><span class="cx"> from twistedcaldav.carddavxml import carddav_namespace
</span><span class="lines">@@ -70,19 +49,39 @@
</span><span class="cx"> from twistedcaldav.datafilters.privateevents import PrivateEventFilter
</span><span class="cx"> from twistedcaldav.extensions import DAVResource, DAVPrincipalResource, \
</span><span class="cx"> DAVResourceWithChildrenMixin
</span><del>-from twistedcaldav import ical
</del><span class="cx"> from twistedcaldav.ical import Component
</span><del>-
</del><span class="cx"> from twistedcaldav.icaldav import ICalDAVResource, ICalendarPrincipalResource
</span><span class="cx"> from twistedcaldav.linkresource import LinkResource
</span><del>-from calendarserver.push.notifier import getPubSubAPSConfiguration
</del><span class="cx"> from twistedcaldav.sharing import SharedResourceMixin, SharedHomeMixin
</span><del>-from txdav.caldav.datastore.util import normalizationLookup
</del><span class="cx"> from twistedcaldav.vcard import Component as vComponent
</span><span class="cx">
</span><ins>+from txdav.caldav.datastore.util import normalizationLookup
</ins><span class="cx"> from txdav.common.icommondatastore import InternalDataStoreError, \
</span><span class="cx"> SyncTokenValidException
</span><ins>+from txdav.xml import element
+from txdav.xml.element import dav_namespace
</ins><span class="cx">
</span><ins>+from txweb2 import responsecode, http, http_headers
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.dav.auth import AuthenticationWrapper as SuperAuthenticationWrapper
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.idav import IDAVPrincipalCollectionResource
+from txweb2.dav.resource import AccessDeniedError, DAVPrincipalCollectionResource, \
+ davPrivilegeSet
+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.dav.util import joinURL, parentForURL, normalizeURL
+from txweb2.http import HTTPError, RedirectResponse, StatusResponse, Response, JSONResponse
+from txweb2.http_headers import MimeType, ETag
+from txweb2.stream import MemoryStream
+
+from urlparse import urlsplit
+from uuid import UUID
+from zope.interface import implements
+import hashlib
+import time
+import urllib
+import uuid
+
</ins><span class="cx"> ##
</span><span class="cx"> # Sharing Conts
</span><span class="cx"> ##
</span><span class="lines">@@ -325,12 +324,23 @@
</span><span class="cx"> @param transaction: optional transaction to use instead of associated transaction
</span><span class="cx"> @type transaction: L{txdav.caldav.idav.ITransaction}
</span><span class="cx"> """
</span><del>- response = yield super(CalDAVResource, self).renderHTTP(request)
</del><ins>+ try:
+ response = yield super(CalDAVResource, self).renderHTTP(request)
+ except AlreadyFinishedError:
+ self._transactionError = True
</ins><span class="cx"> if transaction is None:
</span><span class="cx"> transaction = self._associatedTransaction
</span><span class="cx"> if transaction is not None:
</span><span class="cx"> if self._transactionError:
</span><del>- yield transaction.abort()
</del><ins>+ try:
+ yield transaction.abort()
+ except AlreadyFinishedError:
+ if transaction.timedout:
+ response = http.StatusResponse(responsecode.SERVICE_UNAVAILABLE, responsecode.RESPONSES[responsecode.SERVICE_UNAVAILABLE])
+ response.headers.setHeader("Retry-After", time.time() + config.TransactionHTTPRetrySeconds)
+ raise HTTPError(response)
+ else:
+ raise
</ins><span class="cx"> else:
</span><span class="cx"> yield transaction.commit()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (14797 => 14798)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-05-18 23:51:07 UTC (rev 14797)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-05-19 08:30:26 UTC (rev 14798)
</span><span class="lines">@@ -201,9 +201,11 @@
</span><span class="cx">
</span><span class="cx"> "UseDatabase": True, # True: database; False: files
</span><span class="cx">
</span><del>- "TransactionTimeoutSeconds": 300, # Timeout transactions that take longer than
- # the specified number of seconds. Zero means
- # no timeouts. 5 minute default.
</del><ins>+ "TransactionTimeoutSeconds": 300, # Timeout transactions that take longer than
+ # the specified number of seconds. Zero means
+ # no timeouts. 5 minute default.
+ "TransactionHTTPRetrySeconds": 300, # When a transactions times out tell HTTP clients
+ # clients to retry after this amount of time
</ins><span class="cx">
</span><span class="cx"> "DBType": "", # 2 possible values: empty, meaning 'spawn postgres
</span><span class="cx"> # yourself', or 'postgres', meaning 'connect to a
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_resource.py (14797 => 14798)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_resource.py 2015-05-18 23:51:07 UTC (rev 14797)
+++ CalendarServer/trunk/twistedcaldav/test/test_resource.py 2015-05-19 08:30:26 UTC (rev 14798)
</span><span class="lines">@@ -14,22 +14,26 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twisted.internet.defer import inlineCallbacks
</del><ins>+from twisted.internet import reactor
+from twisted.internet.defer import inlineCallbacks, returnValue, Deferred
+
</ins><span class="cx"> from twistedcaldav import carddavxml
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.notifications import NotificationCollectionResource
</span><del>-from twistedcaldav.resource import (
- CalDAVResource, CommonHomeResource,
</del><ins>+from twistedcaldav.resource import \
+ CalDAVResource, CommonHomeResource, \
</ins><span class="cx"> CalendarHomeResource, AddressBookHomeResource
</span><del>-)
-from twistedcaldav.test.util import (
</del><ins>+from twistedcaldav.storebridge import CalendarCollectionResource
+from twistedcaldav.test.util import TestCase
+from twistedcaldav.test.util import \
</ins><span class="cx"> InMemoryPropertyStore, StoreTestCase, SimpleStoreRequest
</span><del>-)
-from twistedcaldav.test.util import TestCase
</del><ins>+
+from txdav.xml import element
</ins><span class="cx"> from txdav.xml.element import HRef
</span><ins>+
+from txweb2 import responsecode
</ins><span class="cx"> from txweb2.http import HTTPError
</span><span class="cx"> from txweb2.test.test_server import SimpleRequest
</span><del>-from txdav.xml import element
</del><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -86,6 +90,47 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class TransactionTimeoutTests(StoreTestCase):
+
+ @inlineCallbacks
+ def setUp(self):
+ yield super(TransactionTimeoutTests, self).setUp()
+
+
+ @inlineCallbacks
+ def test_timeoutRetry(self):
+ """
+ Test that a timed out transaction during an HTTP request results in a 503 error
+ with a Retry-After header.
+ """
+
+ # Patch request handling to add a delay to trigger the txn time out
+ original = CalendarCollectionResource.iCalendarRolledup
+ @inlineCallbacks
+ def _iCalendarRolledup(self, request):
+ d = Deferred()
+ reactor.callLater(2, d.callback, None)
+ yield d
+ result = yield original(self, request)
+ returnValue(result)
+ self.patch(CalendarCollectionResource, "iCalendarRolledup", _iCalendarRolledup)
+
+ self.patch(self.store, "timeoutTransactions", 1)
+
+ # Run delayed request
+ authPrincipal = yield self.actualRoot.findPrincipalForAuthID("user01")
+ request = SimpleStoreRequest(self, "GET", "/calendars/__uids__/user01/calendar/", authPrincipal=authPrincipal)
+ try:
+ yield self.send(request)
+ except HTTPError as e:
+ self.assertEqual(e.response.code, responsecode.SERVICE_UNAVAILABLE)
+ self.assertTrue(e.response.headers.hasHeader("Retry-After"))
+ self.assertApproximates(int(e.response.headers.getRawHeaders("Retry-After")[0]), config.TransactionHTTPRetrySeconds, 1)
+ else:
+ self.fail("HTTPError not raised")
+
+
+
</ins><span class="cx"> class CommonHomeResourceTests(TestCase):
</span><span class="cx">
</span><span class="cx"> def test_commonHomeliveProperties(self):
</span></span></pre>
</div>
</div>
</body>
</html>