<!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>[15150] CalendarServer/trunk/contrib/performance/jobqueue/loadtest.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/15150">15150</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-24 13:25:13 -0700 (Thu, 24 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support targeting multiple servers. Add an option to specify the time limit for the run.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformancejobqueueloadtestpy">CalendarServer/trunk/contrib/performance/jobqueue/loadtest.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 (15149 => 15150)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py        2015-09-24 20:19:22 UTC (rev 15149)
+++ CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py        2015-09-24 20:25:13 UTC (rev 15150)
</span><span class="lines">@@ -19,11 +19,13 @@
</span><span class="cx"> from caldavclientlibrary.client.httpshandler import SmartHTTPConnection
</span><span class="cx"> from multiprocessing import Process, Value
</span><span class="cx"> import getopt
</span><ins>+import itertools
</ins><span class="cx"> import json
</span><span class="cx"> import random
</span><span class="cx"> import sys
</span><span class="cx"> import time
</span><span class="cx"> from urlparse import urlparse
</span><ins>+import collections
</ins><span class="cx">
</span><span class="cx"> PRIORITY = {
</span><span class="cx"> "low": 0,
</span><span class="lines">@@ -36,23 +38,30 @@
</span><span class="cx"> # Random time delay
</span><span class="cx"> time.sleep(random.randint(0, config["interval"]) / 1000.0)
</span><span class="cx">
</span><del>- url = urlparse(config["server"])
- use_ssl = url[0] == "https"
- if "@" in url[1]:
- auth, net_loc = url[1].split("@")
- else:
- auth = "admin:admin"
- net_loc = url[1]
- host, port = net_loc.split(":")
- port = int(port)
- user, pswd = auth.split(":")
</del><ins>+ ServerDetail = collections.namedtuple("ServerDetails", ("host", "port", "use_ssl", "headers",))
+ server_details = []
+ for server in config["server"].split(","):
+ url = urlparse(server)
+ use_ssl = url[0] == "https"
+ if "@" in url[1]:
+ auth, net_loc = url[1].split("@")
+ else:
+ auth = "admin:admin"
+ net_loc = url[1]
+ host, port = net_loc.split(":")
+ port = int(port)
+ user, pswd = auth.split(":")
</ins><span class="cx">
</span><del>- headers = {}
- headers["User-Agent"] = "httploop/1"
- headers["Depth"] = "1"
- headers["Authorization"] = "Basic " + "{}:{}".format(user, pswd).encode("base64")[:-1]
- headers["Content-Type"] = "application/json"
</del><ins>+ headers = {}
+ headers["User-Agent"] = "httploop/1"
+ headers["Depth"] = "1"
+ headers["Authorization"] = "Basic " + "{}:{}".format(user, pswd).encode("base64")[:-1]
+ headers["Content-Type"] = "application/json"
</ins><span class="cx">
</span><ins>+ server_details.append(ServerDetail(host, port, use_ssl, headers))
+
+ random.shuffle(server_details)
+
</ins><span class="cx"> interval = config["interval"] / 1000.0
</span><span class="cx"> total = config["limit"] / config["numProcesses"]
</span><span class="cx">
</span><span class="lines">@@ -68,13 +77,17 @@
</span><span class="cx"> })
</span><span class="cx">
</span><span class="cx"> base_time = time.time()
</span><ins>+ iter = itertools.cycle(server_details)
</ins><span class="cx"> while not complete.value:
</span><del>- http = SmartHTTPConnection(host, port, use_ssl, False)
</del><span class="cx">
</span><ins>+ server = iter.next()
+ count += 1
+
+ http = SmartHTTPConnection(server.host, server.port, server.use_ssl, False)
+
</ins><span class="cx"> try:
</span><del>- count += 1
- headers["User-Agent"] = "httploop-{}/{}".format(ctr, count,)
- http.request("POST", "/control", jstr, headers)
</del><ins>+ server.headers["User-Agent"] = "httploop-{}/{}".format(ctr, count,)
+ http.request("POST", "/control", jstr, server.headers)
</ins><span class="cx">
</span><span class="cx"> response = http.getresponse()
</span><span class="cx"> response.read()
</span><span class="lines">@@ -111,11 +124,14 @@
</span><span class="cx"> -i MSEC Millisecond delay between each request [1000]
</span><span class="cx"> -r RATE Requests/second rate [10]
</span><span class="cx"> -j JOBS Number of jobs per HTTP request [1]
</span><del>- -s URL URL to connect to [https://localhost:8443]
</del><ins>+ -s URL URL to connect to [https://localhost:8443],
+ can also be a comma separated list of URLs
+ to cycle through
</ins><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="cx"> -l NUM Total number of requests from all processes
</span><span class="cx"> or zero for unlimited [0]
</span><ins>+ -t SEC Number of seconds to run [unlimited]
</ins><span class="cx"> -p low|medium|high Work priority level [high]
</span><span class="cx"> -w NUM Work weight level 1..10 [1]
</span><span class="cx">
</span><span class="lines">@@ -159,8 +175,9 @@
</span><span class="cx"> numProcesses = None
</span><span class="cx"> interval = None
</span><span class="cx"> rate = None
</span><ins>+ runtime = None
</ins><span class="cx">
</span><del>- options, args = getopt.getopt(sys.argv[1:], "b:d:hi:j:l:n:p:r:s:w:", [])
</del><ins>+ options, args = getopt.getopt(sys.argv[1:], "b:d:hi:j:l:n:p:r:s:t: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">@@ -173,12 +190,6 @@
</span><span class="cx"> config["jobs"] = int(value)
</span><span class="cx"> elif option == "-r":
</span><span class="cx"> rate = int(value)
</span><del>- if rate <= 100:
- config["numProcesses"] = rate
- config["interval"] = 1000
- else:
- config["numProcesses"] = 100
- config["interval"] = (config["numProcesses"] * 1000) / rate
</del><span class="cx"> elif option == "-s":
</span><span class="cx"> config["server"] = value
</span><span class="cx"> elif option == "-b":
</span><span class="lines">@@ -187,6 +198,8 @@
</span><span class="cx"> config["delay"] = int(value)
</span><span class="cx"> elif option == "-l":
</span><span class="cx"> config["limit"] = int(value)
</span><ins>+ elif option == "-t":
+ runtime = int(value)
</ins><span class="cx"> elif option == "-p":
</span><span class="cx"> if value not in PRIORITY.keys():
</span><span class="cx"> usage("Unrecognized priority: {}".format(value,))
</span><span class="lines">@@ -216,7 +229,11 @@
</span><span class="cx"> usage("Wrong combination of -n, -i and -r")
</span><span class="cx"> effective_rate = (config["numProcesses"] * 1000) / config["interval"]
</span><span class="cx">
</span><ins>+ if runtime:
+ config["limit"] = effective_rate * runtime
+
</ins><span class="cx"> print("Run details:")
</span><ins>+ print(" Number of servers: {}".format(len(config["server"].split(","))))
</ins><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></span></pre>
</div>
</div>
</body>
</html>