<!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>[15384] CalendarServer/trunk/contrib/performance/loadtest</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/15384">15384</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 08:57:48 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sim should fail if pushes were expected but none were logged.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestconfigoldplist">CalendarServer/trunk/contrib/performance/loadtest/config-old.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestconfigplist">CalendarServer/trunk/contrib/performance/loadtest/config.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestprofilespy">CalendarServer/trunk/contrib/performance/loadtest/profiles.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesttest_profilespy">CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtestconfigoldplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/config-old.plist (15383 => 15384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/config-old.plist 2015-12-14 15:58:10 UTC (rev 15383)
+++ CalendarServer/trunk/contrib/performance/loadtest/config-old.plist 2015-12-14 16:57:48 UTC (rev 15384)
</span><span class="lines">@@ -216,6 +216,10 @@
</span><span class="cx"> <!-- The % of failures that constitute a failed test -->
</span><span class="cx"> <key>failCutoff</key>
</span><span class="cx"> <real>1.0</real>
</span><ins>+
+ <!-- There must be at least one push operation -->
+ <key>failIfNoPush</key>
+ <true/>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </array>
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestconfigplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/config.plist (15383 => 15384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/config.plist 2015-12-14 15:58:10 UTC (rev 15383)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.plist 2015-12-14 16:57:48 UTC (rev 15384)
</span><span class="lines">@@ -215,6 +215,10 @@
</span><span class="cx"> <!-- The % of failures that constitute a failed test -->
</span><span class="cx"> <key>failCutoff</key>
</span><span class="cx"> <real>1.0</real>
</span><ins>+
+ <!-- There must be at least one push operation -->
+ <key>failIfNoPush</key>
+ <true/>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </array>
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestprofilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py (15383 => 15384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2015-12-14 15:58:10 UTC (rev 15383)
+++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2015-12-14 16:57:48 UTC (rev 15384)
</span><span class="lines">@@ -525,6 +525,7 @@
</span><span class="cx"> return accepted
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class AttachmentDownloader(ProfileBase):
</span><span class="cx"> """
</span><span class="cx"> A Calendar user who downloads attachments.
</span><span class="lines">@@ -535,6 +536,7 @@
</span><span class="cx"> ):
</span><span class="cx"> self.enabled = enabled
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def run(self):
</span><span class="cx"> self._subscription = self._client.catalog["eventChanged"].subscribe(self.eventChanged)
</span><span class="cx"> return Deferred()
</span><span class="lines">@@ -1141,7 +1143,9 @@
</span><span class="cx"> if "failCutoff" in params:
</span><span class="cx"> self._fail_cut_off = params["failCutoff"]
</span><span class="cx">
</span><ins>+ self._fail_if_no_push = params.get("failIfNoPush", False)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def observe(self, event):
</span><span class="cx"> if event.get("type") == "operation":
</span><span class="cx"> event = event.copy()
</span><span class="lines">@@ -1182,6 +1186,7 @@
</span><span class="cx">
</span><span class="cx"> _LATENCY_REASON = "Median %(operation)s scheduling lag greater than %(cutoff)sms"
</span><span class="cx"> _FAILED_REASON = "Greater than %(cutoff).0f%% %(operation)s failed"
</span><ins>+ _PUSH_MISSING_REASON = "Push was configured but no pushes were received by clients"
</ins><span class="cx">
</span><span class="cx"> def failures(self):
</span><span class="cx"> reasons = []
</span><span class="lines">@@ -1197,4 +1202,7 @@
</span><span class="cx"> reasons.append(self._FAILED_REASON % dict(
</span><span class="cx"> operation=operation.upper(), cutoff=self._fail_cut_off))
</span><span class="cx">
</span><ins>+ if self._fail_if_no_push and "push" not in self._perOperationTimes:
+ reasons.append(self._PUSH_MISSING_REASON)
+
</ins><span class="cx"> return reasons
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_profilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py (15383 => 15384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2015-12-14 15:58:10 UTC (rev 15383)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2015-12-14 16:57:48 UTC (rev 15384)
</span><span class="lines">@@ -1094,7 +1094,66 @@
</span><span class="cx"> logger.failures())
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_failureNoPush(self):
+ """
+ If there are no pushes, L{OperationLogger.failures} will/will not fail depending
+ on whether the "failIfNoPush" parameter is set.
+ """
</ins><span class="cx">
</span><ins>+ # No pushes, no param
+ logger = OperationLogger(outfile=StringIO())
+ for _ignore in range(98):
+ logger.observe(dict(
+ type='operation', phase='end', user='user01',
+ duration=0.25, label='testing', success=True)
+ )
+ self.assertEqual(
+ [],
+ logger.failures())
+
+ # No pushes, have param True
+ logger = OperationLogger(outfile=StringIO(), failIfNoPush=True)
+ for _ignore in range(98):
+ logger.observe(dict(
+ type='operation', phase='end', user='user01',
+ duration=0.25, label='testing', success=True)
+ )
+ self.assertEqual(
+ [OperationLogger._PUSH_MISSING_REASON],
+ logger.failures())
+
+ # Pushes, have param False
+ logger = OperationLogger(outfile=StringIO(), failIfNoPush=False)
+ for _ignore in range(98):
+ logger.observe(dict(
+ type='operation', phase='end', user='user01',
+ duration=0.25, label='testing', success=True)
+ )
+ logger.observe(dict(
+ type='operation', phase='end', user='user01',
+ duration=0.25, label='push', success=True)
+ )
+ self.assertEqual(
+ [],
+ logger.failures())
+
+ # Pushes, have param True
+ logger = OperationLogger(outfile=StringIO(), failIfNoPush=True)
+ for _ignore in range(98):
+ logger.observe(dict(
+ type='operation', phase='end', user='user01',
+ duration=0.25, label='testing', success=True)
+ )
+ logger.observe(dict(
+ type='operation', phase='end', user='user01',
+ duration=0.25, label='push', success=True)
+ )
+ self.assertEqual(
+ [],
+ logger.failures())
+
+
+
</ins><span class="cx"> class AlarmAcknowledgerTests(TestCase):
</span><span class="cx">
</span><span class="cx"> def test_pastTheHour(self):
</span></span></pre>
</div>
</div>
</body>
</html>