<!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>[15100] 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/15100">15100</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 14:00:24 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the TEST_WORK load testing and monitoring.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverdashboard_servicepy">CalendarServer/trunk/calendarserver/dashboard_service.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancejobqueueloadtestpy">CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancejobqueueworkratepy">CalendarServer/trunk/contrib/performance/jobqueue/workrate.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavcontrolapipy">CalendarServer/trunk/twistedcaldav/controlapi.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverdashboard_servicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/dashboard_service.py (15099 => 15100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/dashboard_service.py 2015-09-03 20:58:58 UTC (rev 15099)
+++ CalendarServer/trunk/calendarserver/dashboard_service.py 2015-09-03 21:00:24 UTC (rev 15100)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if self.factory.store:
</span><del>- txn = self.factory.store.newTransaction()
</del><ins>+ txn = self.factory.store.newTransaction("DashboardProtocol.data_jobs")
</ins><span class="cx"> records = (yield JobItem.histogram(txn))
</span><span class="cx"> yield txn.commit()
</span><span class="cx"> else:
</span><span class="lines">@@ -177,10 +177,12 @@
</span><span class="cx"> if self.factory.store:
</span><span class="cx"> txn = self.factory.store.newTransaction()
</span><span class="cx"> results["queued"] = yield TestWork.count(txn)
</span><ins>+ results["assigned"] = yield JobItem.count(txn, where=(JobItem.assigned != None))
</ins><span class="cx"> results["completed"] = WorkerConnectionPool.completed.get(TestWork.workType(), 0)
</span><span class="cx"> yield txn.commit()
</span><span class="cx"> else:
</span><span class="cx"> results["queued"] = 0
</span><ins>+ results["assigned"] = 0
</ins><span class="cx"> results["completed"] = 0
</span><span class="cx">
</span><span class="cx"> returnValue(results)
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancejobqueueloadtestpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py (15099 => 15100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py 2015-09-03 20:58:58 UTC (rev 15099)
+++ CalendarServer/trunk/contrib/performance/jobqueue/loadtest.py 2015-09-03 21:00:24 UTC (rev 15100)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> print("Work details:")
</span><span class="cx"> print(" Priority: {}").format(config["priority"])
</span><span class="cx"> print(" Weight: {}").format(config["weight"])
</span><del>- print(" Start delay: {} ms").format(config["when"])
</del><ins>+ print(" Start delay: {} s").format(config["when"])
</ins><span class="cx"> print(" Execution time: {} ms").format(config["delay"])
</span><span class="cx"> print(" Average queue depth: {}").format((effective_rate * config["delay"]) / 1000)
</span><span class="cx"> print("")
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancejobqueueworkratepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/jobqueue/workrate.py (15099 => 15100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/jobqueue/workrate.py 2015-09-03 20:58:58 UTC (rev 15099)
+++ CalendarServer/trunk/contrib/performance/jobqueue/workrate.py 2015-09-03 21:00:24 UTC (rev 15100)
</span><span class="lines">@@ -124,6 +124,7 @@
</span><span class="cx">
</span><span class="cx"> queued = self.client.currentData["test_work"]["queued"]
</span><span class="cx"> completed = self.client.currentData["test_work"]["completed"]
</span><ins>+ assigned = self.client.currentData["test_work"]["assigned"]
</ins><span class="cx"> if self.last_queued is not None:
</span><span class="cx"> diff_queued = (self.last_queued - queued) / (t - self.last_time)
</span><span class="cx"> diff_completed = (completed - self.last_completed) / (t - self.last_time)
</span><span class="lines">@@ -133,7 +134,7 @@
</span><span class="cx"> self.last_queued = queued
</span><span class="cx"> self.last_completed = completed
</span><span class="cx"> self.last_time = t
</span><del>- print("{}\t{:.1f}\t{:.1f}".format(queued, diff_queued, diff_completed,))
</del><ins>+ print("{}\t{}\t{:.1f}\t{:.1f}".format(queued, assigned, diff_queued, diff_completed,))
</ins><span class="cx">
</span><span class="cx"> self.sched.enter(max(self.seconds - (time.time() - t), 0), 0, self.updateResults, ())
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavcontrolapipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/controlapi.py (15099 => 15100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/controlapi.py 2015-09-03 20:58:58 UTC (rev 15099)
+++ CalendarServer/trunk/twistedcaldav/controlapi.py 2015-09-03 21:00:24 UTC (rev 15100)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> from txweb2.http_headers import MimeType
</span><span class="cx">
</span><span class="cx"> import json
</span><ins>+import time
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -329,7 +330,7 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_refreshgroups(self, j):
</span><del>- txn = self._store.newTransaction()
</del><ins>+ txn = self._store.newTransaction(label="ControlAPIResource.action_refreshgroups")
</ins><span class="cx"> yield txn.directoryService().flush()
</span><span class="cx"> work = yield GroupCacherPollingWork.reschedule(txn, 0, force=True)
</span><span class="cx"> jobID = work.jobID
</span><span class="lines">@@ -383,10 +384,12 @@
</span><span class="cx"> except KeyError:
</span><span class="cx"> jobs = 1
</span><span class="cx">
</span><ins>+ start_time = time.time()
</ins><span class="cx"> for _ in range(jobs):
</span><ins>+ effective_when = max(when - (time.time() - start_time), 0)
</ins><span class="cx"> yield TestWork.schedule(
</span><span class="cx"> self._store,
</span><del>- when,
</del><ins>+ effective_when,
</ins><span class="cx"> priority,
</span><span class="cx"> weight,
</span><span class="cx"> delay,
</span><span class="lines">@@ -403,7 +406,7 @@
</span><span class="cx"> from txdav.common.datastore.work.revision_cleanup import _triggerRevisionCleanup
</span><span class="cx"> from txdav.common.datastore.work.revision_cleanup import RevisionCleanupWork
</span><span class="cx">
</span><del>- txn = self._store.newTransaction()
</del><ins>+ txn = self._store.newTransaction(label="ControlAPIResource.action_revisioncleanup")
</ins><span class="cx"> yield _triggerRevisionCleanup(txn, 60)
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>