<!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>[15633] 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/15633">15633</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-05-23 12:36:46 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split large members( ) queries into batches; log an error if an LDAP query exceeds a time threshold</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 (15632 => 15633)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py 2016-05-23 17:23:34 UTC (rev 15632)
+++ twext/trunk/twext/who/ldap/_service.py 2016-05-23 19:36:46 UTC (rev 15633)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> import collections
</span><span class="cx"> import ldap.async
</span><ins>+import time
</ins><span class="cx">
</span><span class="cx"> from twisted.python.constants import Names, NamedConstant
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="lines">@@ -237,6 +238,7 @@
</span><span class="cx"> threadPoolMax=10,
</span><span class="cx"> connectionMax=10,
</span><span class="cx"> tries=3,
</span><ins>+ warningThresholdSeconds=5,
</ins><span class="cx"> _debug=False,
</span><span class="cx"> ):
</span><span class="cx"> """
</span><span class="lines">@@ -281,6 +283,7 @@
</span><span class="cx"> self._timeout = timeout
</span><span class="cx"> self._extraFilters = extraFilters
</span><span class="cx"> self._tries = tries
</span><ins>+ self._warningThresholdSeconds = warningThresholdSeconds
</ins><span class="cx">
</span><span class="cx"> if tlsCACertificateFile is None:
</span><span class="cx"> self._tlsCACertificateFile = None
</span><span class="lines">@@ -682,6 +685,8 @@
</span><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> try:
</span><ins>+ startTime = time.time()
+
</ins><span class="cx"> s = ldap.async.List(connection)
</span><span class="cx"> s.startSearch(
</span><span class="cx"> ldap.dn.dn2str(rdn),
</span><span class="lines">@@ -699,6 +704,7 @@
</span><span class="cx"> )
</span><span class="cx"> s.processResults()
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> except ldap.SIZELIMIT_EXCEEDED as e:
</span><span class="cx"> self.log.debug(
</span><span class="cx"> "LDAP result limit exceeded: {limit}",
</span><span class="lines">@@ -748,6 +754,16 @@
</span><span class="cx"> in s.allResults
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+ totalTime = time.time() - startTime
+ if totalTime > self._warningThresholdSeconds:
+ if filteredQuery and len(filteredQuery) > 500:
+ filteredQuery = "%s..." % (filteredQuery[:500],)
+ self.log.error(
+ "LDAP query exceeded threshold: {totalTime:.2f} seconds for {rdn} {query} (#results={resultCount})",
+ totalTime=totalTime, rdn=rdn,
+ query=filteredQuery, resultCount=len(reply)
+ )
+
</ins><span class="cx"> newRecords = self._recordsFromReply(
</span><span class="cx"> reply, recordType=recordType
</span><span class="cx"> )
</span><span class="lines">@@ -1067,7 +1083,20 @@
</span><span class="cx"> # return succeed(None)
</span><span class="cx">
</span><span class="cx">
</span><ins>+def splitIntoBatches(data, size):
+ """
+ Return a generator of lists consisting of the contents of the data set
+ split into parts no larger than size.
+ """
+ if not data:
+ yield []
+ data = list(data)
+ while data:
+ yield data[:size]
+ del data[:size]
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> @implementer(IPlaintextPasswordVerifier)
</span><span class="cx"> class DirectoryRecord(BaseDirectoryRecord):
</span><span class="cx"> """
</span><span class="lines">@@ -1127,15 +1156,18 @@
</span><span class="cx"> matchType=MatchType.equals
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- expression = CompoundExpression(
- matchExpressions,
- Operand.OR
- )
- for record in (yield self.service.recordsFromCompoundExpression(
- expression, recordTypes=[recordType]
- )):
- members.add(record)
</del><span class="cx">
</span><ins>+ # split into batches of 500
+ for batch in splitIntoBatches(matchExpressions, 500):
+ expression = CompoundExpression(
+ batch,
+ Operand.OR
+ )
+ for record in (yield self.service.recordsFromCompoundExpression(
+ expression, recordTypes=[recordType]
+ )):
+ members.add(record)
+
</ins><span class="cx"> for dnStr in faultByDN:
</span><span class="cx"> record = yield self.service._recordWithDN(dnStr.replace("+", "\+"))
</span><span class="cx"> members.add(record)
</span></span></pre>
</div>
</div>
</body>
</html>