<!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>[15572] 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/15572">15572</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-05-03 09:46:28 -0700 (Tue, 03 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add some more exception handlers to turn cross-pod errors into 503's.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.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 (15571 => 15572)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2016-05-03 13:48:29 UTC (rev 15571)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2016-05-03 16:46:28 UTC (rev 15572)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> from txdav.caldav.datastore.util import normalizationLookup
</span><span class="cx"> from txdav.common.icommondatastore import InternalDataStoreError, \
</span><span class="cx"> SyncTokenValidException, ExternalShareFailed
</span><ins>+from txdav.common.datastore.podding.base import FailedCrossPodRequestError
</ins><span class="cx"> from txdav.xml import element
</span><span class="cx"> from txdav.xml.element import dav_namespace
</span><span class="cx">
</span><span class="lines">@@ -363,6 +364,12 @@
</span><span class="cx"> # the transaction commit
</span><span class="cx"> self._transactionError = False
</span><span class="cx"> response = StatusResponse(responsecode.SERVICE_UNAVAILABLE, "Shared collection not valid - removing.")
</span><ins>+ except FailedCrossPodRequestError:
+ # This happens when a cross-pod connection attempt fails. Treat as a 503 so the client
+ # can try again once the pod is back up.
+ response = StatusResponse(responsecode.SERVICE_UNAVAILABLE, "Unable to do cross-pod request.")
+ response.headers.setHeader("Retry-After", time.time() + config.TransactionHTTPRetrySeconds)
+
</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></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (15571 => 15572)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2016-05-03 13:48:29 UTC (rev 15571)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2016-05-03 16:46:28 UTC (rev 15572)
</span><span class="lines">@@ -260,7 +260,9 @@
</span><span class="cx"> @param arg: description of error or C{None}
</span><span class="cx"> @type arg: C{str} or C{None}
</span><span class="cx"> """
</span><del>- raise HTTPError(StatusResponse(responsecode.SERVICE_UNAVAILABLE, arg if arg is not None else str(err)))
</del><ins>+ response = StatusResponse(responsecode.SERVICE_UNAVAILABLE, arg if arg is not None else str(err))
+ response.headers.setHeader("Retry-After", time.time() + config.TransactionHTTPRetrySeconds)
+ raise HTTPError(response)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="lines">@@ -398,7 +400,11 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if self._newStoreObject:
</span><del>- newStoreObject = yield self._newStoreObject.objectResourceWithName(name)
</del><ins>+ try:
+ newStoreObject = yield self._newStoreObject.objectResourceWithName(name)
+ except Exception as err:
+ self._handleStoreException(err, self.StoreExceptionsErrors)
+ raise
</ins><span class="cx">
</span><span class="cx"> similar = self._childClass(
</span><span class="cx"> newStoreObject,
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_resource.py (15571 => 15572)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_resource.py 2016-05-03 13:48:29 UTC (rev 15571)
+++ CalendarServer/trunk/twistedcaldav/test/test_resource.py 2016-05-03 16:46:28 UTC (rev 15572)
</span><span class="lines">@@ -28,6 +28,9 @@
</span><span class="cx"> from twistedcaldav.test.util import \
</span><span class="cx"> InMemoryPropertyStore, StoreTestCase, SimpleStoreRequest
</span><span class="cx">
</span><ins>+from txdav.caldav.datastore.sql import Calendar
+from txdav.common.datastore.podding.base import FailedCrossPodRequestError
+from txdav.common.icommondatastore import ExternalShareFailed
</ins><span class="cx"> from txdav.xml import element
</span><span class="cx"> from txdav.xml.element import HRef
</span><span class="cx">
</span><span class="lines">@@ -90,11 +93,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class TransactionTimeoutTests(StoreTestCase):
</del><ins>+class TransactionErrorTests(StoreTestCase):
</ins><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def setUp(self):
</span><del>- yield super(TransactionTimeoutTests, self).setUp()
</del><ins>+ yield super(TransactionErrorTests, self).setUp()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -130,7 +133,77 @@
</span><span class="cx"> self.fail("HTTPError not raised")
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_conduitRetry(self):
+ """
+ Test that a cross-pod error during an HTTP request results in a 503 error
+ with a Retry-After header.
+ """
</ins><span class="cx">
</span><ins>+ # Patch request handling to raise an exception
+ def _iCalendarRolledup(self, request):
+ raise FailedCrossPodRequestError()
+ 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)
+ response = yield self.send(request)
+ self.assertEqual(response.code, responsecode.SERVICE_UNAVAILABLE)
+ self.assertTrue(response.headers.hasHeader("Retry-After"))
+ self.assertApproximates(int(response.headers.getRawHeaders("Retry-After")[0]), config.TransactionHTTPRetrySeconds, 1)
+
+
+ @inlineCallbacks
+ def test_failedShareRetry(self):
+ """
+ Test that a cross-pod error during an HTTP request results in a 503 error
+ without a Retry-After header.
+ """
+
+ # Patch request handling to raise an exception
+ def _iCalendarRolledup(self, request):
+ raise ExternalShareFailed()
+ self.patch(CalendarCollectionResource, "iCalendarRolledup", _iCalendarRolledup)
+
+ # Run delayed request
+ authPrincipal = yield self.actualRoot.findPrincipalForAuthID("user01")
+ request = SimpleStoreRequest(self, "GET", "/calendars/__uids__/user01/calendar/", authPrincipal=authPrincipal)
+ response = yield self.send(request)
+ self.assertEqual(response.code, responsecode.SERVICE_UNAVAILABLE)
+ self.assertFalse(response.headers.hasHeader("Retry-After"))
+
+
+ @inlineCallbacks
+ def test_failedPodChildRetry(self):
+ """
+ Test that a cross-pod error during an HTTP request results in a 503 error
+ with a Retry-After header.
+ """
+
+ # Patch request handling to raise an exception
+ def _objectResourceWithName(self, name):
+ raise FailedCrossPodRequestError()
+ self.patch(Calendar, "objectResourceWithName", _objectResourceWithName)
+
+ self.patch(self.store, "timeoutTransactions", 1)
+
+ # Run delayed request
+ authPrincipal = yield self.actualRoot.findPrincipalForAuthID("user01")
+ request = SimpleStoreRequest(self, "GET", "/calendars/__uids__/user01/calendar/1.ics", 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>