<!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>[13858] 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/13858">13858</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-08-08 12:39:14 -0700 (Fri, 08 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use a thread pool for LDAP connections to avoid internal python-ldap locking issues when doing concurrent LDAP requests.
Expose thread pool usage via the dashboard.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdashboardpy">CalendarServer/trunk/calendarserver/tools/dashboard.py</a></li>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunktxdavwhoaugmentpy">CalendarServer/trunk/txdav/who/augment.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdashboardpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashboard.py (13857 => 13858)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashboard.py 2014-08-08 19:36:13 UTC (rev 13857)
+++ CalendarServer/trunk/calendarserver/tools/dashboard.py 2014-08-08 19:39:14 UTC (rev 13858)
</span><span class="lines">@@ -982,15 +982,22 @@
</span><span class="cx"> y += 2
</span><span class="cx">
</span><span class="cx"> overallCount = 0
</span><ins>+ overallCountRatio = 0
</ins><span class="cx"> overallCountCached = 0
</span><span class="cx"> overallCountUncached = 0
</span><span class="cx"> overallTimeSpent = 0.0
</span><span class="cx">
</span><del>- for methodName, (count, timeSpent) in sorted(records.items(), key=lambda x: x[0]):
</del><ins>+ for methodName, result in sorted(records.items(), key=lambda x: x[0]):
+ if isinstance(result, int):
+ count, timeSpent = result, 0.0
+ else:
+ count, timeSpent = result
</ins><span class="cx"> overallCount += count
</span><span class="cx"> if methodName.endswith("-hit"):
</span><ins>+ overallCountRatio += count
</ins><span class="cx"> overallCountCached += count
</span><span class="cx"> if "-" not in methodName:
</span><ins>+ overallCountRatio += count
</ins><span class="cx"> overallCountUncached += count
</span><span class="cx"> overallTimeSpent += timeSpent
</span><span class="cx">
</span><span class="lines">@@ -1018,13 +1025,13 @@
</span><span class="cx"> s_cached = " {:<40}{:>15d}{:>14.1f}%{:>15s} ".format(
</span><span class="cx"> "Total Cached:",
</span><span class="cx"> overallCountCached,
</span><del>- safeDivision(overallCountCached, overallCount, 100.0),
</del><ins>+ safeDivision(overallCountCached, overallCountRatio, 100.0),
</ins><span class="cx"> "",
</span><span class="cx"> )
</span><span class="cx"> s_uncached = " {:<40}{:>15d}{:>14.1f}%{:>15s} ".format(
</span><span class="cx"> "Total Uncached:",
</span><span class="cx"> overallCountUncached,
</span><del>- safeDivision(overallCountUncached, overallCount, 100.0),
</del><ins>+ safeDivision(overallCountUncached, overallCountRatio, 100.0),
</ins><span class="cx"> "",
</span><span class="cx"> )
</span><span class="cx"> if self.usesCurses:
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (13857 => 13858)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2014-08-08 19:36:13 UTC (rev 13857)
+++ CalendarServer/trunk/requirements-stable.txt 2014-08-08 19:39:14 UTC (rev 13858)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> # For CalendarServer development, don't try to get these projects from PyPI; use svn.
</span><span class="cx">
</span><span class="cx"> -e .
</span><del>--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13851#egg=twextpy
</del><ins>+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13857#egg=twextpy
</ins><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
</span><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13802#egg=pycalendar
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/augment.py (13857 => 13858)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/augment.py 2014-08-08 19:36:13 UTC (rev 13857)
+++ CalendarServer/trunk/txdav/who/augment.py 2014-08-08 19:39:14 UTC (rev 13858)
</span><span class="lines">@@ -110,7 +110,14 @@
</span><span class="cx"> self._store = store
</span><span class="cx"> self._augmentDB = augmentDB
</span><span class="cx">
</span><ins>+ # Look for an LDAP DS with extra info to expose to the dashboard
+ self._ldapDS = None
+ for ds in self._directory._services:
+ if hasattr(ds, "poolStats"):
+ self._ldapDS = ds
+ break
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @classmethod
</span><span class="cx"> def _addTiming(cls, key, duration):
</span><span class="cx"> if key not in cls._timings:
</span><span class="lines">@@ -122,9 +129,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def stats(self):
</span><del>- return succeed(self._timings)
</del><ins>+ results = {}
+ results.update(self._timings)
+
+ # An LDAP DS has extra info to expose via the dashboard
+ if self._ldapDS is not None:
+ results.update(self._ldapDS.poolStats)
</ins><span class="cx">
</span><ins>+ return succeed(results)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @property
</span><span class="cx"> def recordType(self):
</span><span class="cx"> # Defer to the directory service we're augmenting
</span></span></pre>
</div>
</div>
</body>
</html>