<!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>[14964] 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/14964">14964</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-14 17:55:00 -0700 (Tue, 14 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add -j option to job load test tool to specify number of jobs created per HTTP request.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformancejobqueueloadtestpy">CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavcontrolapipy">CalendarServer/trunk/twistedcaldav/controlapi.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformancejobqueueloadtestpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py (14963 => 14964)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py        2015-07-14 21:01:30 UTC (rev 14963)
+++ CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py        2015-07-15 00:55:00 UTC (rev 14964)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> "action": "testwork",
</span><span class="cx"> "when": config["when"],
</span><span class="cx"> "delay": config["delay"],
</span><ins>+ "jobs": config["jobs"],
</ins><span class="cx"> "priority": PRIORITY[config["priority"]],
</span><span class="cx"> "weight": config["weight"],
</span><span class="cx"> })
</span><span class="lines">@@ -99,6 +100,7 @@
</span><span class="cx"> -n NUM Number of child processes [10]
</span><span class="cx"> -i MSEC Millisecond delay between each request [1000]
</span><span class="cx"> -r RATE Requests/second rate [10]
</span><ins>+ -j JOBS Number of jobs per HTTP request [1]
</ins><span class="cx"> -s HOST:PORT Host/port to connect to [localhost:8443]
</span><span class="cx"> -b SEC Number of seconds for notBefore [0]
</span><span class="cx"> -d MSEC Number of milliseconds for the work [10]
</span><span class="lines">@@ -136,6 +138,7 @@
</span><span class="cx"> config = {
</span><span class="cx"> "numProcesses": 10,
</span><span class="cx"> "interval": 1000,
</span><ins>+ "jobs": 1,
</ins><span class="cx"> "server": "localhost:8443",
</span><span class="cx"> "when": 0,
</span><span class="cx"> "delay": 10,
</span><span class="lines">@@ -147,7 +150,7 @@
</span><span class="cx"> interval = None
</span><span class="cx"> rate = None
</span><span class="cx">
</span><del>- options, args = getopt.getopt(sys.argv[1:], "b:d:hi:l:n:p:r:s:w:", [])
</del><ins>+ options, args = getopt.getopt(sys.argv[1:], "b:d:hi:j:l:n:p:r:s:w:", [])
</ins><span class="cx">
</span><span class="cx"> for option, value in options:
</span><span class="cx"> if option == "-h":
</span><span class="lines">@@ -156,6 +159,8 @@
</span><span class="cx"> numProcesses = int(value)
</span><span class="cx"> elif option == "-i":
</span><span class="cx"> interval = int(value)
</span><ins>+ elif option == "-j":
+ config["jobs"] = int(value)
</ins><span class="cx"> elif option == "-r":
</span><span class="cx"> rate = int(value)
</span><span class="cx"> if rate <= 100:
</span><span class="lines">@@ -205,6 +210,8 @@
</span><span class="cx"> print(" Number of processes: {}".format(config["numProcesses"]))
</span><span class="cx"> print(" Interval between requests: {} ms".format(config["interval"]))
</span><span class="cx"> print(" Effective request rate: {} req/sec".format(effective_rate))
</span><ins>+ print(" Jobs per request: {}".format(config["jobs"]))
+ print(" Effective job rate: {} jobs/sec".format(effective_rate * config["jobs"]))
</ins><span class="cx"> print(" Total number of requests: {}").format(config["limit"] if config["limit"] != 0 else "unlimited")
</span><span class="cx"> print("")
</span><span class="cx"> print("Work details:")
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavcontrolapipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/controlapi.py (14963 => 14964)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/controlapi.py        2015-07-14 21:01:30 UTC (rev 14963)
+++ CalendarServer/trunk/twistedcaldav/controlapi.py        2015-07-15 00:55:00 UTC (rev 14964)
</span><span class="lines">@@ -377,14 +377,19 @@
</span><span class="cx"> delay = j["delay"]
</span><span class="cx"> except KeyError:
</span><span class="cx"> delay = 0
</span><ins>+ try:
+ jobs = j["jobs"]
+ except KeyError:
+ jobs = 1
</ins><span class="cx">
</span><del>- yield TestWork.schedule(
- self._store,
- when,
- priority,
- weight,
- delay,
- )
</del><ins>+ for _ in range(jobs):
+ yield TestWork.schedule(
+ self._store,
+ when,
+ priority,
+ weight,
+ delay,
+ )
</ins><span class="cx">
</span><span class="cx"> returnValue(self._ok("ok", "Test work scheduled"))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>