<!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>[13696] twext/trunk/twext/enterprise</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/13696">13696</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-27 12:22:06 -0700 (Fri, 27 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix service termination race condition that would result in a terminated transaction continuing to sending SQL to the server.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterpriseadbapi2py">twext/trunk/twext/enterprise/adbapi2.py</a></li>
<li><a href="#twexttrunktwextenterprisefixturespy">twext/trunk/twext/enterprise/fixtures.py</a></li>
<li><a href="#twexttrunktwextenterprisetesttest_adbapi2py">twext/trunk/twext/enterprise/test/test_adbapi2.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterpriseadbapi2py"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/adbapi2.py (13695 => 13696)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/adbapi2.py 2014-06-27 19:20:13 UTC (rev 13695)
+++ twext/trunk/twext/enterprise/adbapi2.py 2014-06-27 19:22:06 UTC (rev 13696)
</span><span class="lines">@@ -306,6 +306,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def execSQL(self, *args, **kw):
</span><ins>+ if self._completed:
+ raise RuntimeError("Attempt to use {} transaction.".format(self._completed))
</ins><span class="cx"> result = self._holder.submit(
</span><span class="cx"> lambda: self._reallyExecSQL(*args, **kw)
</span><span class="cx"> )
</span><span class="lines">@@ -322,12 +324,14 @@
</span><span class="cx"> return result
</span><span class="cx">
</span><span class="cx">
</span><del>- def _end(self, really):
</del><ins>+ def _end(self, really, terminate=False):
</ins><span class="cx"> """
</span><span class="cx"> Common logic for commit or abort. Executed in the main reactor thread.
</span><span class="cx">
</span><span class="cx"> @param really: the callable to execute in the cursor thread to actually
</span><span class="cx"> do the commit or rollback.
</span><ins>+ @param terminate: abort and prevent any new SQL from being executed even
+ after a reset().
</ins><span class="cx">
</span><span class="cx"> @return: a L{Deferred} which fires when the database logic has
</span><span class="cx"> completed.
</span><span class="lines">@@ -336,7 +340,7 @@
</span><span class="cx"> committed or aborted.
</span><span class="cx"> """
</span><span class="cx"> if not self._completed:
</span><del>- self._completed = "ended"
</del><ins>+ self._completed = "terminated" if terminate else "ended"
</ins><span class="cx">
</span><span class="cx"> def reallySomething():
</span><span class="cx"> """
</span><span class="lines">@@ -346,7 +350,6 @@
</span><span class="cx"> if self._cursor is None or self._first:
</span><span class="cx"> return
</span><span class="cx"> really()
</span><del>- self._first = True
</del><span class="cx">
</span><span class="cx"> result = self._holder.submit(reallySomething)
</span><span class="cx"> self._pool._repoolAfter(self, result)
</span><span class="lines">@@ -363,6 +366,10 @@
</span><span class="cx"> return self._end(self._connection.rollback).addErrback(log.err)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def terminate(self):
+ return self._end(self._connection.rollback, terminate=True).addErrback(log.err)
+
+
</ins><span class="cx"> def reset(self):
</span><span class="cx"> """
</span><span class="cx"> Call this when placing this transaction back into the pool.
</span><span class="lines">@@ -372,7 +379,9 @@
</span><span class="cx"> """
</span><span class="cx"> if not self._completed:
</span><span class="cx"> raise RuntimeError("Attempt to re-set active transaction.")
</span><del>- self._completed = False
</del><ins>+ if self._completed != "terminated":
+ self._completed = False
+ self._first = True
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _releaseConnection(self):
</span><span class="lines">@@ -919,7 +928,10 @@
</span><span class="cx"> return d
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def terminate(self):
+ return self.abort()
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def _fork(x):
</span><span class="cx"> """
</span><span class="cx"> Produce a L{Deferred} that will fire when another L{Deferred} fires without
</span><span class="lines">@@ -1034,10 +1046,11 @@
</span><span class="cx"> while self._finishing:
</span><span class="cx"> yield _fork(self._finishing[0][1])
</span><span class="cx">
</span><del>- # Phase 3: All of the busy transactions must be aborted first. As each
- # one is aborted, it will remove itself from the list.
</del><ins>+ # Phase 3: All of the busy transactions must be terminated first. As each
+ # one is terminated, it will remove itself from the list. Note we terminate
+ # and not abort the transaction to ensure they cannot be re-used.
</ins><span class="cx"> while self._busy:
</span><del>- yield self._busy[0].abort()
</del><ins>+ yield self._busy[0].terminate()
</ins><span class="cx">
</span><span class="cx"> # Phase 4: All transactions should now be in the free list, since
</span><span class="cx"> # "abort()" will have put them there. Shut down all the associated
</span></span></pre></div>
<a id="twexttrunktwextenterprisefixturespy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/fixtures.py (13695 => 13696)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/fixtures.py 2014-06-27 19:20:13 UTC (rev 13695)
+++ twext/trunk/twext/enterprise/fixtures.py 2014-06-27 19:22:06 UTC (rev 13696)
</span><span class="lines">@@ -458,6 +458,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def execute(self, sql, args=()):
</span><ins>+ if self.connection.closed:
+ raise FakeConnectionError
</ins><span class="cx"> self.connection.executions += 1
</span><span class="cx"> if self.connection._executeFailQueue:
</span><span class="cx"> raise self.connection._executeFailQueue.pop(0)()
</span></span></pre></div>
<a id="twexttrunktwextenterprisetesttest_adbapi2py"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/test/test_adbapi2.py (13695 => 13696)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/test/test_adbapi2.py 2014-06-27 19:20:13 UTC (rev 13695)
+++ twext/trunk/twext/enterprise/test/test_adbapi2.py 2014-06-27 19:22:06 UTC (rev 13696)
</span><span class="lines">@@ -463,6 +463,25 @@
</span><span class="cx"> self.assertEquals(self.factory.connections[1].closed, True)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_partialTxnFailsDuringStopService(self):
+ """
+ Using the logic in L{ConnectionPool.stopService}, make sure that an
+ L{_ConnectedTxn} cannot continue to process SQL after L{_ConnectedTxn.abort}
+ is called and before L{_ConnectedTxn.reset} is called.
+ """
+ txn = self.createTransaction()
+ if hasattr(txn, "_baseTxn"):
+ # Send initial statement
+ txn.execSQL("maybe change something!")
+
+ # Make it look like the service is stopping
+ txn._baseTxn._connection.close()
+ txn._baseTxn.terminate()
+
+ # Try to send more SQL - must fail
+ self.failUnlessRaises(RuntimeError, txn.execSQL, "maybe change something else!")
+
+
</ins><span class="cx"> def test_abortRecycledTransaction(self):
</span><span class="cx"> """
</span><span class="cx"> L{ConnectionPool.stopService} will shut down if a recycled transaction
</span></span></pre>
</div>
</div>
</body>
</html>