<!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>[15600] twext/trunk/twext/who/ldap/_service.py</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/15600">15600</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-05-18 14:11:35 -0700 (Wed, 18 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Additional LDAP diagnostics</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwholdap_servicepy">twext/trunk/twext/who/ldap/_service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwholdap_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_service.py (15599 => 15600)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py 2016-05-18 19:45:34 UTC (rev 15599)
+++ twext/trunk/twext/who/ldap/_service.py 2016-05-18 21:11:35 UTC (rev 15600)
</span><span class="lines">@@ -444,9 +444,16 @@
</span><span class="cx">
</span><span class="cx"> self.poolStats[connectionID] += 1
</span><span class="cx"> self.activeCount += 1
</span><ins>+ self.poolStats["connection-active"] = self.activeCount
</ins><span class="cx"> self.poolStats["connection-max"] = max(
</span><span class="cx"> self.poolStats["connection-max"], self.activeCount
</span><span class="cx"> )
</span><ins>+
+ if self.activeCount > self.connectionMax:
+ self.log.error(
+ "Active LDAP connections ({active}) exceeds maximum ({max})",
+ active=self.activeCount, max=self.connectionMax
+ )
</ins><span class="cx"> return connection
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -478,8 +485,6 @@
</span><span class="cx">
</span><span class="cx"> @raises: L{LDAPConnectionError} if unable to connect.
</span><span class="cx"> """
</span><del>- # FIXME: ldap connection objects are not thread safe, so let's set up
- # a connection pool
</del><span class="cx">
</span><span class="cx"> self.log.debug("Connecting to LDAP at {log_source.url}")
</span><span class="cx"> connection = self._newConnection()
</span><span class="lines">@@ -556,10 +561,14 @@
</span><span class="cx">
</span><span class="cx"> @raises: L{LDAPConnectionError} if unable to connect.
</span><span class="cx"> """
</span><del>- return deferToThreadPool(
</del><ins>+ d = deferToThreadPool(
</ins><span class="cx"> reactor, self.threadpool,
</span><span class="cx"> self._authenticateUsernamePassword_inThread, dn, password
</span><span class="cx"> )
</span><ins>+ qsize = self.threadpool._queue.qsize()
+ if qsize > 0:
+ self.log.error("LDAP thread pool overflowing: {qsize}", qsize=qsize)
+ return d
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _authenticateUsernamePassword_inThread(self, dn, password):
</span><span class="lines">@@ -589,23 +598,14 @@
</span><span class="cx"> self.log.debug("Unable to authenticate {dn}", dn=dn)
</span><span class="cx"> return False
</span><span class="cx"> finally:
</span><del>- # TODO: should we explicitly "close" the connection in a finally
- # clause rather than just let it go out of scope and be garbage
- # collected at some indeterminate point in the future?
- # Up side is that we won't hang on to the connection or other
- # resources for longer than needed.
- # Down side is we will take a little bit of extra time in this call
- # to close it down.
- # If we do decide to "close" then we probably have to use one of
- # the "unbind" methods on the L{LDAPObject}.
- connection = None
</del><ins>+ connection.unbind()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _recordsFromQueryString(
</span><span class="cx"> self, queryString, recordTypes=None,
</span><span class="cx"> limitResults=None, timeoutSeconds=None
</span><span class="cx"> ):
</span><del>- return deferToThreadPool(
</del><ins>+ d = deferToThreadPool(
</ins><span class="cx"> reactor, self.threadpool,
</span><span class="cx"> self._recordsFromQueryString_inThread,
</span><span class="cx"> queryString,
</span><span class="lines">@@ -613,6 +613,10 @@
</span><span class="cx"> limitResults=limitResults,
</span><span class="cx"> timeoutSeconds=timeoutSeconds
</span><span class="cx"> )
</span><ins>+ qsize = self.threadpool._queue.qsize()
+ if qsize > 0:
+ self.log.error("LDAP thread pool overflowing: {qsize}", qsize=qsize)
+ return d
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _addExtraFilter(self, recordType, queryString):
</span><span class="lines">@@ -783,12 +787,17 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _recordWithDN(self, dn):
</span><del>- return deferToThreadPool(
</del><ins>+ d = deferToThreadPool(
</ins><span class="cx"> reactor, self.threadpool,
</span><span class="cx"> self._recordWithDN_inThread, dn
</span><span class="cx"> )
</span><ins>+ qsize = self.threadpool._queue.qsize()
+ if qsize > 0:
+ self.log.error("LDAP thread pool overflowing: {qsize}", qsize=qsize)
+ return d
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def _recordWithDN_inThread(self, dn):
</span><span class="cx"> """
</span><span class="cx"> @param dn: The DN of the record to search for
</span></span></pre>
</div>
</div>
</body>
</html>