<!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>[15389] 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/15389">15389</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 12:48:17 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>dashboard can now track the maximum HTTP slot usage over the stats intervals.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserveraccesslogpy">CalendarServer/trunk/calendarserver/accesslog.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverdashboard_servicepy">CalendarServer/trunk/calendarserver/dashboard_service.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsdashviewpy">CalendarServer/trunk/calendarserver/tools/dashview.py</a></li>
<li><a href="#CalendarServertrunktxweb2metafdpy">CalendarServer/trunk/txweb2/metafd.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserveraccesslogpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/accesslog.py (15388 => 15389)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/accesslog.py 2015-12-14 20:12:56 UTC (rev 15388)
+++ CalendarServer/trunk/calendarserver/accesslog.py 2015-12-14 20:48:17 UTC (rev 15389)
</span><span class="lines">@@ -473,6 +473,7 @@
</span><span class="cx"> "t" : 0.0,
</span><span class="cx"> "t-resp-wr" : 0.0,
</span><span class="cx"> "slots" : 0,
</span><ins>+ "max-slots" : 0,
</ins><span class="cx"> "T" : initTimeHistogram(),
</span><span class="cx"> "T-RESP-WR" : initTimeHistogram(),
</span><span class="cx"> "T-MAX" : 0.0,
</span><span class="lines">@@ -499,6 +500,7 @@
</span><span class="cx"> current["t"] += stats.get("t", 0.0)
</span><span class="cx"> current["t-resp-wr"] += stats.get("t-resp-wr", 0.0)
</span><span class="cx"> current["slots"] += stats.get("outstandingRequests", 0)
</span><ins>+ current["max-slots"] = max(current["max-slots"], self.limiter.maxOutstandingRequests if hasattr(self, "limiter") else 0)
</ins><span class="cx"> current["cpu"] += self.systemStats.items["cpu use"]
</span><span class="cx">
</span><span class="cx"> def histogramUpdate(t, key):
</span><span class="lines">@@ -548,6 +550,7 @@
</span><span class="cx"> current["t"] += stats["t"]
</span><span class="cx"> current["t-resp-wr"] += stats["t-resp-wr"]
</span><span class="cx"> current["slots"] += stats["slots"]
</span><ins>+ current["max-slots"] = max(current["max-slots"], stats["max-slots"])
</ins><span class="cx"> current["cpu"] += stats["cpu"]
</span><span class="cx">
</span><span class="cx"> def histogramUpdate(t, key):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverdashboard_servicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/dashboard_service.py (15388 => 15389)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/dashboard_service.py 2015-12-14 20:12:56 UTC (rev 15388)
+++ CalendarServer/trunk/calendarserver/dashboard_service.py 2015-12-14 20:48:17 UTC (rev 15389)
</span><span class="lines">@@ -209,6 +209,7 @@
</span><span class="cx"> def __init__(self, logObserver, limiter):
</span><span class="cx"> self.logger = logObserver
</span><span class="cx"> self.limiter = limiter
</span><ins>+ self.logger.limiter = self.limiter
</ins><span class="cx"> self.store = None
</span><span class="cx"> self.directory = None
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsdashviewpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashview.py (15388 => 15389)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashview.py 2015-12-14 20:12:56 UTC (rev 15388)
+++ CalendarServer/trunk/calendarserver/tools/dashview.py 2015-12-14 20:48:17 UTC (rev 15389)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> """
</span><span class="cx"> if len(self.currentData) == 0:
</span><span class="cx"> self.update()
</span><del>- return self.currentData["pods"][pod][server][item]
</del><ins>+ return self.currentData["pods"][pod][server].get(item)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -755,7 +755,7 @@
</span><span class="cx"> clientItem = "stats"
</span><span class="cx">
</span><span class="cx"> windowTitle = "Request Statistics"
</span><del>- formatWidth = 84
</del><ins>+ formatWidth = 92
</ins><span class="cx"> additionalRows = 4
</span><span class="cx">
</span><span class="cx"> def updateRowCount(self):
</span><span class="lines">@@ -766,11 +766,11 @@
</span><span class="cx"> records = defaultIfNone(self.clientData(), {})
</span><span class="cx"> self.iter += 1
</span><span class="cx">
</span><del>- s1 = " {:<8}{:>8}{:>10}{:>10}{:>10}{:>10}{:>8}{:>8}{:>8} ".format(
- "Period", "Reqs", "Av-Reqs", "Av-Resp", "Av-NoWr", "Max-Resp", "Slot", "CPU ", "500's"
</del><ins>+ s1 = " {:<8}{:>8}{:>10}{:>10}{:>10}{:>10}{:>8}{:>8}{:>8}{:>8} ".format(
+ "Period", "Reqs", "Av-Reqs", "Av-Resp", "Av-NoWr", "Max-Resp", "Slot", "Slot", "CPU ", "500's"
</ins><span class="cx"> )
</span><del>- s2 = " {:<8}{:>8}{:>10}{:>10}{:>10}{:>10}{:>8}{:>8}{:>8} ".format(
- "", "", "per sec", "(ms)", "(ms)", "(ms)", "Avg.", "Avg.", ""
</del><ins>+ s2 = " {:<8}{:>8}{:>10}{:>10}{:>10}{:>10}{:>8}{:>8}{:>8}{:>8} ".format(
+ "", "", "per sec", "(ms)", "(ms)", "(ms)", "Avg.", "Max", "Avg.", ""
</ins><span class="cx"> )
</span><span class="cx"> pt = self.tableHeader((s1, s2,), len(records))
</span><span class="cx">
</span><span class="lines">@@ -784,7 +784,7 @@
</span><span class="cx"> "cpu": 0.0,
</span><span class="cx"> "500": 0,
</span><span class="cx"> })
</span><del>- s = " {:<8}{:>8}{:>10.1f}{:>10.1f}{:>10.1f}{:>10.1f}{:>8.2f}{:>7.1f}%{:>8} ".format(
</del><ins>+ s = " {:<8}{:>8}{:>10.1f}{:>10.1f}{:>10.1f}{:>10.1f}{:>8.2f}{:>8}{:>7.1f}%{:>8} ".format(
</ins><span class="cx"> key,
</span><span class="cx"> stat["requests"],
</span><span class="cx"> safeDivision(float(stat["requests"]), seconds),
</span><span class="lines">@@ -792,6 +792,7 @@
</span><span class="cx"> safeDivision(stat["t"] - stat["t-resp-wr"], stat["requests"]),
</span><span class="cx"> stat["T-MAX"],
</span><span class="cx"> safeDivision(float(stat["slots"]), stat["requests"]),
</span><ins>+ stat["max-slots"],
</ins><span class="cx"> safeDivision(stat["cpu"], stat["requests"]),
</span><span class="cx"> stat["500"],
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunktxweb2metafdpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/metafd.py (15388 => 15389)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/metafd.py 2015-12-14 20:12:56 UTC (rev 15388)
+++ CalendarServer/trunk/txweb2/metafd.py 2015-12-14 20:48:17 UTC (rev 15389)
</span><span class="lines">@@ -320,6 +320,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> _outstandingRequests = 0
</span><ins>+ _maxOutstandingRequests = 0
</ins><span class="cx">
</span><span class="cx"> def __init__(self, maxAccepts, maxRequests):
</span><span class="cx"> """
</span><span class="lines">@@ -429,6 +430,7 @@
</span><span class="cx"> current = sum(status.effective()
</span><span class="cx"> for status in self.dispatcher.statuses)
</span><span class="cx"> self._outstandingRequests = current # preserve for or= field in log
</span><ins>+ self._maxOutstandingRequests = max(self._maxOutstandingRequests, self._outstandingRequests)
</ins><span class="cx"> maximum = self.maxRequests
</span><span class="cx"> overloaded = (current >= maximum)
</span><span class="cx"> available = len(filter(lambda x: x.active(), self.dispatcher.statuses))
</span><span class="lines">@@ -445,7 +447,18 @@
</span><span class="cx"> return self._outstandingRequests
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @property # make read-only
+ def maxOutstandingRequests(self):
+ """
+ Reset the max value to the current outstanding value every time the max is read. It
+ is up to the caller to track the overall max value.
+ """
+ temp = self._maxOutstandingRequests
+ self._maxOutstandingRequests = self._outstandingRequests
+ return temp
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class LimitingInheritingProtocolFactory(InheritingProtocolFactory):
</span><span class="cx"> """
</span><span class="cx"> An L{InheritingProtocolFactory} that supports the implicit factory contract
</span></span></pre>
</div>
</div>
</body>
</html>