<!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>[11840] 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/11840">11840</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-10-28 17:05:11 -0700 (Mon, 28 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge sim improvements, and SQL performance tweaks from branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserveraccesslogpy">CalendarServer/trunk/calendarserver/accesslog.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestconfigdistplist">CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestconfigplist">CalendarServer/trunk/contrib/performance/loadtest/config.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestpopulationpy">CalendarServer/trunk/contrib/performance/loadtest/population.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestsimpy">CalendarServer/trunk/contrib/performance/loadtest/sim.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesttest_simpy">CalendarServer/trunk/contrib/performance/loadtest/test_sim.py</a></li>
<li><a href="#CalendarServertrunkcontribtoolsfix_calendar">CalendarServer/trunk/contrib/tools/fix_calendar</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavscheduling_storecaldavresourcepy">CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoreutilpy">CalendarServer/trunk/txdav/base/datastore/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastorefilepy">CalendarServer/trunk/txdav/caldav/datastore/file.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulepy">CalendarServer/trunk/txdav/caldav/datastore/schedule.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingutilspy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/utils.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_utilpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestclientsplist">CalendarServer/trunk/contrib/performance/loadtest/clients.plist</a></li>
<li>CalendarServer/trunk/contrib/performance/loadtest/standard-configs/</li>
<li><a href="#CalendarServertrunkcontribperformanceloadteststandardconfigseventsonlyplist">CalendarServer/trunk/contrib/performance/loadtest/standard-configs/events-only.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesacceptsplist">CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-accepts.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesonlyrecurringplist">CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesonlyplist">CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only.plist</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadteststandardconfigseventsonlyplist">CalendarServer/trunk/contrib/performance/loadtest/standard-configs/events-only.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesacceptsplist">CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-accepts.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesonlyrecurringplist">CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesonlyplist">CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only.plist</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServertrunk">CalendarServer/trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunk"></a>
<div class="propset"><h4>Property changes: CalendarServer/trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11612
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx"> + /CalDAVTester/trunk:11193-11198
</span><span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11612
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><a id="CalendarServertrunkcalendarserveraccesslogpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/accesslog.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/accesslog.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/calendarserver/accesslog.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> formatArgs["t"] = (nowtime - request.timeStamps[0][1]) * 1000
</span><span class="cx">
</span><span class="cx"> if hasattr(request, "extendedLogItems"):
</span><del>- for k, v in request.extendedLogItems.iteritems():
</del><ins>+ for k, v in sorted(request.extendedLogItems.iteritems(), key=lambda x: x[0]):
</ins><span class="cx"> k = str(k).replace('"', "%22")
</span><span class="cx"> v = str(v).replace('"', "%22")
</span><span class="cx"> if " " in v:
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestclientsplistfromrev11836CalendarServerbranchesuserscdabooperformancetweakscontribperformanceloadtestclientsplist"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/contrib/performance/loadtest/clients.plist (from rev 11836, CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/clients.plist) (0 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/clients.plist         (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/clients.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -0,0 +1,445 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2013 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+        <dict>
+                <!-- Define the kinds of software and user behavior the load simulation
+                        will simulate. -->
+                <key>clients</key>
+
+                <!-- Have as many different kinds of software and user behavior configurations
+                        as you want. Each is a dict -->
+                <array>
+
+                        <dict>
+
+                                <!-- Here is a OS X client simulator. -->
+                                <key>software</key>
+                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
+
+                                <!-- Arguments to use to initialize the OS_X_10_7 instance. -->
+                                <key>params</key>
+                                <dict>
+                                        <!-- Name that appears in logs. -->
+                                        <key>title</key>
+                                        <string>10.7</string>
+        
+                                        <!-- OS_X_10_7 can poll the calendar home at some interval. This is
+                                                in seconds. -->
+                                        <key>calendarHomePollInterval</key>
+                                        <integer>30</integer>
+
+                                        <!-- If the server advertises xmpp push, OS_X_10_7 can wait for notifications
+                                                about calendar home changes instead of polling for them periodically. If
+                                                this option is true, then look for the server advertisement for xmpp push
+                                                and use it if possible. Still fall back to polling if there is no xmpp push
+                                                advertised. -->
+                                        <key>supportPush</key>
+                                        <false />
+
+                                        <key>supportAmpPush</key>
+                                        <true/>
+                                        <key>ampPushHost</key>
+                                        <string>localhost</string>
+                                        <key>ampPushPort</key>
+                                        <integer>62311</integer>
+                                </dict>
+
+                                <!-- The profiles define certain types of user behavior on top of the
+                                        client software being simulated. -->
+                                <key>profiles</key>
+                                <array>
+
+                                        <!-- First an event-creating profile, which will periodically create
+                                                new events at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new event. -->
+                                                        <key>interval</key>
+                                                        <integer>60</integer>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <true/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+                                                                                
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+                                                                                
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+                                                                                
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile invites some number of new attendees to new events. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the frequency at which new invitations will be sent out. -->
+                                                        <key>sendInvitationDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.NormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mu gives the mean of the normal distribution (in seconds). -->
+                                                                        <key>mu</key>
+                                                                        <integer>60</integer>
+
+                                                                        <!-- and sigma gives its standard deviation. -->
+                                                                        <key>sigma</key>
+                                                                        <integer>5</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define the distribution of who will be invited to an event.
+                                                        
+                                                                When inviteeClumping is turned on each invitee is based on a sample of
+                                                                users "close to" the organizer based on account index. If the clumping
+                                                                is too "tight" for the requested number of attendees, then invites for
+                                                                those larger numbers will simply fail (the sim will report that situation).
+                                                                
+                                                                When inviteeClumping is off invitees will be sampled across an entire
+                                                                range of account indexes. In this case the distribution ought to be a
+                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
+                                                        -->
+                                                        <key>inviteeDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
+                                                                        <key>min</key>
+                                                                        <integer>0</integer>
+                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
+                                                                        <key>max</key>
+                                                                        <integer>99</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <key>inviteeClumping</key>
+                                                        <true/>
+
+                                                        <!-- Define the distribution of how many attendees will be invited to an event.
+                                                        
+                                                                LogNormal is the best fit to observed data.
+
+
+                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
+                                                                mode should typically be 1, and mean whatever matches the user behavior.
+                                                                Our typical mean is 6.                                                         
+                                                         -->
+                                                        <key>inviteeCountDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mode - peak-->
+                                                                        <key>mode</key>
+                                                                        <integer>1</integer>
+                                                                        <!-- mean - average-->
+                                                                        <key>median</key>
+                                                                        <integer>6</integer>
+                                                                        <!-- maximum -->
+                                                                        <key>maximum</key>
+                                                                        <real>60</real>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <true/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+                                                                                
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+                                                                                
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+                                                                                
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile accepts invitations to events, handles cancels, and
+                                         handles replies received. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define how long to wait after seeing a new invitation before
+                                                                accepting it.
+
+                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
+                                                                (i.e., half of the user have accepted by that time).                                                                
+                                                        -->
+                                                        <key>acceptDelayDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mode - peak-->
+                                                                        <key>mode</key>
+                                                                        <integer>300</integer>
+                                                                        <!-- median - 50% done-->
+                                                                        <key>median</key>
+                                                                        <integer>1800</integer>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- A task-creating profile, which will periodically create
+                                                new tasks at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new task. -->
+                                                        <key>interval</key>
+                                                        <integer>300</integer>
+
+                                                        <!-- Define how due times (DUE) for the randomly generated tasks
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>taskDueDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                </array>
+
+                                <!-- Determine the frequency at which this client configuration will
+                                        appear in the clients which are created by the load tester. -->
+                                <key>weight</key>
+                                <integer>1</integer>
+                        </dict>
+                </array>
+        </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestconfigdistplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -50,10 +50,19 @@
</span><span class="cx">                         <integer>8080</integer>
</span><span class="cx">                 </dict>
</span><span class="cx">
</span><del>-                <!-- Define whether client data should be saved and re-used. -->
</del><ins>+                <!-- Define whether server supports stats socket. -->
+                <key>serverStats</key>
+                <dict>
+                        <key>enabled</key>
+                        <true/>
+                        <key>Port</key>
+                        <integer>8100</integer>
+                </dict>
+
+                <!-- Define whether client data should be re-used. It will always be saved to the specified path.-->
</ins><span class="cx">                 <key>clientDataSerialization</key>
</span><span class="cx">                 <dict>
</span><del>-                        <key>Enabled</key>
</del><ins>+                        <key>UseOldData</key>
</ins><span class="cx">                         <true/>
</span><span class="cx">                         <key>Path</key>
</span><span class="cx">                         <string>/tmp/sim</string>
</span><span class="lines">@@ -119,471 +128,6 @@
</span><span class="cx">
</span><span class="cx">                 </dict>
</span><span class="cx">
</span><del>-                <!-- Define the kinds of software and user behavior the load simulation
-                        will simulate. -->
-                <key>clients</key>
-
-                <!-- Have as many different kinds of software and user behavior configurations
-                        as you want. Each is a dict -->
-                <array>
-
-                        <dict>
-
-                                <!-- Here is a OS X client simulator. -->
-                                <key>software</key>
-                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
-
-                                <!-- Arguments to use to initialize the OS_X_10_7 instance. -->
-                                <key>params</key>
-                                <dict>
-                                        <!-- Name that appears in logs. -->
-                                        <key>title</key>
-                                        <string>10.7</string>
-
-                                        <!-- OS_X_10_7 can poll the calendar home at some interval. This is
-                                                in seconds. -->
-                                        <key>calendarHomePollInterval</key>
-                                        <integer>30</integer>
-
-                                        <!-- If the server advertises xmpp push, OS_X_10_7 can wait for notifications
-                                                about calendar home changes instead of polling for them periodically. If
-                                                this option is true, then look for the server advertisement for xmpp push
-                                                and use it if possible. Still fall back to polling if there is no xmpp push
-                                                advertised. -->
-                                        <key>supportPush</key>
-                                        <false />
-                                </dict>
-
-                                <!-- The profiles define certain types of user behavior on top of the
-                                        client software being simulated. -->
-                                <key>profiles</key>
-                                <array>
-
-                                        <!-- First an event-creating profile, which will periodically create
-                                                new events at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new event. -->
-                                                        <key>interval</key>
-                                                        <integer>60</integer>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <true/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile invites new attendees to existing events.
-                                         This profile should no longer be used - use RealisticInviter instead. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Inviter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the frequency at which new invitations will be sent out. -->
-                                                        <key>sendInvitationDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.NormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mu gives the mean of the normal distribution (in seconds). -->
-                                                                        <key>mu</key>
-                                                                        <integer>60</integer>
-
-                                                                        <!-- and sigma gives its standard deviation. -->
-                                                                        <key>sigma</key>
-                                                                        <integer>5</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define the distribution of who will be invited to an event. Each
-                                                                set of credentials loaded by the load tester has an index; samples from this
-                                                                distribution will be added to that index to arrive at the index of some other
-                                                                credentials, which will be the target of the invitation. -->
-                                                        <key>inviteeDistanceDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
-                                                                        <key>min</key>
-                                                                        <integer>-100</integer>
-                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
-                                                                        <key>max</key>
-                                                                        <integer>101</integer>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile invites some number of new attendees to new events. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the frequency at which new invitations will be sent out. -->
-                                                        <key>sendInvitationDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.NormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mu gives the mean of the normal distribution (in seconds). -->
-                                                                        <key>mu</key>
-                                                                        <integer>60</integer>
-
-                                                                        <!-- and sigma gives its standard deviation. -->
-                                                                        <key>sigma</key>
-                                                                        <integer>5</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define the distribution of who will be invited to an event.
-                                                        
-                                                                When inviteeClumping is turned on each invitee is based on a sample of
-                                                                users "close to" the organizer based on account index. If the clumping
-                                                                is too "tight" for the requested number of attendees, then invites for
-                                                                those larger numbers will simply fail (the sim will report that situation).
-                                                                
-                                                                When inviteeClumping is off invitees will be sampled across an entire
-                                                                range of account indexes. In this case the distribution ought to be a
-                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
-                                                        -->
-                                                        <key>inviteeDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
-                                                                        <key>min</key>
-                                                                        <integer>-100</integer>
-                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
-                                                                        <key>max</key>
-                                                                        <integer>101</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <key>inviteeClumping</key>
-                                                        <true/>
-
-                                                        <!-- Define the distribution of how many attendees will be invited to an event.
-                                                        
-                                                                LogNormal is the best fit to observed data.
-
-
-                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
-                                                                mode should typically be 1, and mean whatever matches the user behavior.
-                                                                Our typical mean is 6.                                                         
-                                                         -->
-                                                        <key>inviteeCountDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mode - peak-->
-                                                                        <key>mode</key>
-                                                                        <integer>1</integer>
-                                                                        <!-- mean - average-->
-                                                                        <key>median</key>
-                                                                        <integer>6</integer>
-                                                                        <!-- maximum -->
-                                                                        <key>maximum</key>
-                                                                        <real>100</real>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <true/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile accepts invitations to events, handles cancels, and
-                                         handles replies received. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define how long to wait after seeing a new invitation before
-                                                                accepting it.
-
-                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
-                                                                (i.e., half of the user have accepted by that time).                                                                
-                                                        -->
-                                                        <key>acceptDelayDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mode - peak-->
-                                                                        <key>mode</key>
-                                                                        <integer>300</integer>
-                                                                        <!-- median - 50% done-->
-                                                                        <key>median</key>
-                                                                        <integer>1800</integer>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- A task-creating profile, which will periodically create
-                                                new tasks at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new task. -->
-                                                        <key>interval</key>
-                                                        <integer>300</integer>
-
-                                                        <!-- Define how due times (DUE) for the randomly generated tasks
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>taskDueDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                </array>
-
-                                <!-- Determine the frequency at which this client configuration will
-                                        appear in the clients which are created by the load tester. -->
-                                <key>weight</key>
-                                <integer>1</integer>
-                        </dict>
-                </array>
-
</del><span class="cx">                 <!-- Define some log observers to report on the load test. -->
</span><span class="cx">                 <key>observers</key>
</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 (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/config.plist        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -37,10 +37,19 @@
</span><span class="cx">                         <integer>8080</integer>
</span><span class="cx">                 </dict>
</span><span class="cx">
</span><del>-                <!-- Define whether client data should be saved and re-used. -->
</del><ins>+                <!-- Define whether server supports stats socket. -->
+                <key>serverStats</key>
+                <dict>
+                        <key>enabled</key>
+                        <true/>
+                        <key>Port</key>
+                        <integer>8100</integer>
+                </dict>
+
+                <!-- Define whether client data should be re-used. It will always be saved to the specified path.-->
</ins><span class="cx">                 <key>clientDataSerialization</key>
</span><span class="cx">                 <dict>
</span><del>-                        <key>Enabled</key>
</del><ins>+                        <key>UseOldData</key>
</ins><span class="cx">                         <true/>
</span><span class="cx">                         <key>Path</key>
</span><span class="cx">                         <string>/tmp/sim</string>
</span><span class="lines">@@ -106,429 +115,6 @@
</span><span class="cx">
</span><span class="cx">                 </dict>
</span><span class="cx">
</span><del>-                <!-- Define the kinds of software and user behavior the load simulation
-                        will simulate. -->
-                <key>clients</key>
-
-                <!-- Have as many different kinds of software and user behavior configurations
-                        as you want. Each is a dict -->
-                <array>
-
-                        <dict>
-
-                                <!-- Here is a OS X client simulator. -->
-                                <key>software</key>
-                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
-
-                                <!-- Arguments to use to initialize the OS_X_10_7 instance. -->
-                                <key>params</key>
-                                <dict>
-                                        <!-- Name that appears in logs. -->
-                                        <key>title</key>
-                                        <string>10.7</string>
-        
-                                        <!-- OS_X_10_7 can poll the calendar home at some interval. This is
-                                                in seconds. -->
-                                        <key>calendarHomePollInterval</key>
-                                        <integer>30</integer>
-
-                                        <!-- If the server advertises xmpp push, OS_X_10_7 can wait for notifications
-                                                about calendar home changes instead of polling for them periodically. If
-                                                this option is true, then look for the server advertisement for xmpp push
-                                                and use it if possible. Still fall back to polling if there is no xmpp push
-                                                advertised. -->
-                                        <key>supportPush</key>
-                                        <false />
-
-                                        <key>supportAmpPush</key>
-                                        <true/>
-                                        <key>ampPushHost</key>
-                                        <string>localhost</string>
-                                        <key>ampPushPort</key>
-                                        <integer>62311</integer>
-                                </dict>
-
-                                <!-- The profiles define certain types of user behavior on top of the
-                                        client software being simulated. -->
-                                <key>profiles</key>
-                                <array>
-
-                                        <!-- First an event-creating profile, which will periodically create
-                                                new events at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new event. -->
-                                                        <key>interval</key>
-                                                        <integer>60</integer>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <true/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile invites some number of new attendees to new events. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the frequency at which new invitations will be sent out. -->
-                                                        <key>sendInvitationDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.NormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mu gives the mean of the normal distribution (in seconds). -->
-                                                                        <key>mu</key>
-                                                                        <integer>60</integer>
-
-                                                                        <!-- and sigma gives its standard deviation. -->
-                                                                        <key>sigma</key>
-                                                                        <integer>5</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define the distribution of who will be invited to an event.
-                                                        
-                                                                When inviteeClumping is turned on each invitee is based on a sample of
-                                                                users "close to" the organizer based on account index. If the clumping
-                                                                is too "tight" for the requested number of attendees, then invites for
-                                                                those larger numbers will simply fail (the sim will report that situation).
-                                                                
-                                                                When inviteeClumping is off invitees will be sampled across an entire
-                                                                range of account indexes. In this case the distribution ought to be a
-                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
-                                                        -->
-                                                        <key>inviteeDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
-                                                                        <key>min</key>
-                                                                        <integer>0</integer>
-                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
-                                                                        <key>max</key>
-                                                                        <integer>99</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <key>inviteeClumping</key>
-                                                        <true/>
-
-                                                        <!-- Define the distribution of how many attendees will be invited to an event.
-                                                        
-                                                                LogNormal is the best fit to observed data.
-
-
-                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
-                                                                mode should typically be 1, and mean whatever matches the user behavior.
-                                                                Our typical mean is 6.                                                         
-                                                         -->
-                                                        <key>inviteeCountDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mode - peak-->
-                                                                        <key>mode</key>
-                                                                        <integer>1</integer>
-                                                                        <!-- mean - average-->
-                                                                        <key>median</key>
-                                                                        <integer>6</integer>
-                                                                        <!-- maximum -->
-                                                                        <key>maximum</key>
-                                                                        <real>60</real>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <true/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile accepts invitations to events, handles cancels, and
-                                         handles replies received. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define how long to wait after seeing a new invitation before
-                                                                accepting it.
-
-                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
-                                                                (i.e., half of the user have accepted by that time).                                                                
-                                                        -->
-                                                        <key>acceptDelayDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mode - peak-->
-                                                                        <key>mode</key>
-                                                                        <integer>300</integer>
-                                                                        <!-- median - 50% done-->
-                                                                        <key>median</key>
-                                                                        <integer>1800</integer>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- A task-creating profile, which will periodically create
-                                                new tasks at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new task. -->
-                                                        <key>interval</key>
-                                                        <integer>300</integer>
-
-                                                        <!-- Define how due times (DUE) for the randomly generated tasks
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>taskDueDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                </array>
-
-                                <!-- Determine the frequency at which this client configuration will
-                                        appear in the clients which are created by the load tester. -->
-                                <key>weight</key>
-                                <integer>1</integer>
-                        </dict>
-                </array>
-
</del><span class="cx">                 <!-- Define some log observers to report on the load test. -->
</span><span class="cx">                 <key>observers</key>
</span><span class="cx">                 <array>
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestpopulationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/population.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/population.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/contrib/performance/loadtest/population.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -396,6 +396,7 @@
</span><span class="cx"> self._failed_clients = []
</span><span class="cx"> self._failed_sim = collections.defaultdict(int)
</span><span class="cx"> self._startTime = datetime.now()
</span><ins>+ self._expired_data = None
</ins><span class="cx">
</span><span class="cx"> # Load parameters from config
</span><span class="cx"> if "thresholdsPath" in params:
</span><span class="lines">@@ -423,6 +424,13 @@
</span><span class="cx"> self._fail_cut_off = params["failCutoff"]
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def observe(self, event):
+ if event.get('type') == 'sim-expired':
+ self.simExpired(event)
+ else:
+ super(ReportStatistics, self).observe(event)
+
+
</ins><span class="cx"> def countUsers(self):
</span><span class="cx"> return len(self._users)
</span><span class="cx">
</span><span class="lines">@@ -454,6 +462,10 @@
</span><span class="cx"> self._failed_sim[event['reason']] += 1
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def simExpired(self, event):
+ self._expired_data = event['reason']
+
+
</ins><span class="cx"> def printMiscellaneous(self, output, items):
</span><span class="cx"> maxColumnWidth = str(len(max(items.iterkeys(), key=len)))
</span><span class="cx"> fmt = "%" + maxColumnWidth + "s : %-s\n"
</span><span class="lines">@@ -527,8 +539,22 @@
</span><span class="cx"> if self.countSimFailures() > 0:
</span><span class="cx"> for reason, count in self._failed_sim.items():
</span><span class="cx"> items['Failed operation'] = "%s : %d times" % (reason, count,)
</span><ins>+ output.write("* Client\n")
</ins><span class="cx"> self.printMiscellaneous(output, items)
</span><span class="cx"> output.write("\n")
</span><ins>+
+ if self._expired_data is not None:
+ items = {
+ "Req/sec" : "%.1f" % (self._expired_data[0],),
+ "Response": "%.1f (ms)" % (self._expired_data[1],),
+ "Slots": "%.2f" % (self._expired_data[2],),
+ "CPU": "%.1f%%" % (self._expired_data[3],),
+ }
+ output.write("* Server (Last 5 minutes)\n")
+ self.printMiscellaneous(output, items)
+ output.write("\n")
+ output.write("* Details\n")
+
</ins><span class="cx"> self.printHeader(output, [
</span><span class="cx"> (label, width)
</span><span class="cx"> for (label, width, _ignore_fmt)
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestsimpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/sim.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -23,11 +23,15 @@
</span><span class="cx"> from plistlib import readPlist
</span><span class="cx"> from random import Random
</span><span class="cx"> from sys import argv, stdout
</span><ins>+from urlparse import urlsplit
</ins><span class="cx"> from xml.parsers.expat import ExpatError
</span><ins>+import json
+import shutil
+import socket
</ins><span class="cx">
</span><span class="cx"> from twisted.python import context
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><del>-from twisted.python.log import startLogging, addObserver, removeObserver
</del><ins>+from twisted.python.log import startLogging, addObserver, removeObserver, msg
</ins><span class="cx"> from twisted.python.usage import UsageError, Options
</span><span class="cx"> from twisted.python.reflect import namedAny
</span><span class="cx">
</span><span class="lines">@@ -56,6 +60,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+def safeDivision(value, total, factor=1):
+ return value * factor / total if total else 0
+
+
+
</ins><span class="cx"> def generateRecords(count, uidPattern="user%d", passwordPattern="user%d",
</span><span class="cx"> namePattern="User %d", emailPattern="user%d@example.com"):
</span><span class="cx"> for i in xrange(count):
</span><span class="lines">@@ -121,6 +130,7 @@
</span><span class="cx"> """
</span><span class="cx"> config = None
</span><span class="cx"> _defaultConfig = FilePath(__file__).sibling("config.plist")
</span><ins>+ _defaultClients = FilePath(__file__).sibling("clients.plist")
</ins><span class="cx">
</span><span class="cx"> optParameters = [
</span><span class="cx"> ("runtime", "t", None,
</span><span class="lines">@@ -129,6 +139,9 @@
</span><span class="cx"> ("config", None, _defaultConfig,
</span><span class="cx"> "Configuration plist file name from which to read simulation parameters.",
</span><span class="cx"> FilePath),
</span><ins>+ ("clients", None, _defaultClients,
+ "Configuration plist file name from which to read client parameters.",
+ FilePath),
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -181,7 +194,23 @@
</span><span class="cx"> finally:
</span><span class="cx"> configFile.close()
</span><span class="cx">
</span><ins>+ try:
+ clientFile = self['clients'].open()
+ except IOError, e:
+ raise UsageError("--clients %s: %s" % (
+ self['clients'].path, e.strerror))
+ try:
+ try:
+ client_config = readPlist(clientFile)
+ self.config["clients"] = client_config["clients"]
+ if "arrivalInterval" in client_config:
+ self.config["arrival"]["params"]["interval"] = client_config["arrivalInterval"]
+ except ExpatError, e:
+ raise UsageError("--clients %s: %s" % (self['clients'].path, e))
+ finally:
+ clientFile.close()
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> Arrival = namedtuple('Arrival', 'factory parameters')
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -200,7 +229,7 @@
</span><span class="cx"> user information about the accounts on the server being put
</span><span class="cx"> under load.
</span><span class="cx"> """
</span><del>- def __init__(self, server, principalPathTemplate, webadminPort, serializationPath, arrival, parameters, observers=None,
</del><ins>+ def __init__(self, server, principalPathTemplate, webadminPort, serverStats, serializationPath, arrival, parameters, observers=None,
</ins><span class="cx"> records=None, reactor=None, runtime=None, workers=None,
</span><span class="cx"> configTemplate=None, workerID=None, workerCount=1):
</span><span class="cx"> if reactor is None:
</span><span class="lines">@@ -208,6 +237,7 @@
</span><span class="cx"> self.server = server
</span><span class="cx"> self.principalPathTemplate = principalPathTemplate
</span><span class="cx"> self.webadminPort = webadminPort
</span><ins>+ self.serverStats = serverStats
</ins><span class="cx"> self.serializationPath = serializationPath
</span><span class="cx"> self.arrival = arrival
</span><span class="cx"> self.parameters = parameters
</span><span class="lines">@@ -260,15 +290,17 @@
</span><span class="cx"> principalPathTemplate = config['principalPathTemplate']
</span><span class="cx">
</span><span class="cx"> if 'clientDataSerialization' in config:
</span><del>- if config['clientDataSerialization']['Enabled']:
- serializationPath = config['clientDataSerialization']['Path']
- if not isdir(serializationPath):
- try:
- mkdir(serializationPath)
- except OSError:
- print("Unable to create client data serialization directory: %s" % (serializationPath))
- print("Please consult the clientDataSerialization stanza of contrib/performance/loadtest/config.plist")
- raise
</del><ins>+ serializationPath = config['clientDataSerialization']['Path']
+ if not config['clientDataSerialization']['UseOldData']:
+ shutil.rmtree(serializationPath)
+ serializationPath = config['clientDataSerialization']['Path']
+ if not isdir(serializationPath):
+ try:
+ mkdir(serializationPath)
+ except OSError:
+ print("Unable to create client data serialization directory: %s" % (serializationPath))
+ print("Please consult the clientDataSerialization stanza of contrib/performance/loadtest/config.plist")
+ raise
</ins><span class="cx">
</span><span class="cx"> if 'arrival' in config:
</span><span class="cx"> arrival = Arrival(
</span><span class="lines">@@ -310,6 +342,11 @@
</span><span class="cx"> if config['webadmin']['enabled']:
</span><span class="cx"> webadminPort = config['webadmin']['HTTPPort']
</span><span class="cx">
</span><ins>+ serverStats = None
+ if 'serverStats' in config:
+ if config['serverStats']['enabled']:
+ serverStats = config['serverStats']
+
</ins><span class="cx"> observers = []
</span><span class="cx"> if 'observers' in config:
</span><span class="cx"> for observer in config['observers']:
</span><span class="lines">@@ -324,11 +361,23 @@
</span><span class="cx"> records.extend(namedAny(loader)(**params))
</span><span class="cx"> output.write("Loaded {0} accounts.\n".format(len(records)))
</span><span class="cx">
</span><del>- return cls(server, principalPathTemplate, webadminPort, serializationPath,
- arrival, parameters, observers=observers,
- records=records, runtime=runtime, reactor=reactor,
- workers=workers, configTemplate=configTemplate,
- workerID=workerID, workerCount=workerCount)
</del><ins>+ return cls(
+ server,
+ principalPathTemplate,
+ webadminPort,
+ serverStats,
+ serializationPath,
+ arrival,
+ parameters,
+ observers=observers,
+ records=records,
+ runtime=runtime,
+ reactor=reactor,
+ workers=workers,
+ configTemplate=configTemplate,
+ workerID=workerID,
+ workerCount=workerCount,
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="lines">@@ -409,7 +458,7 @@
</span><span class="cx"> def run(self, output=stdout):
</span><span class="cx"> self.attachServices(output)
</span><span class="cx"> if self.runtime is not None:
</span><del>- self.reactor.callLater(self.runtime, self.reactor.stop)
</del><ins>+ self.reactor.callLater(self.runtime, self.stopAndReport)
</ins><span class="cx"> if self.webadminPort:
</span><span class="cx"> self.reactor.listenTCP(self.webadminPort, server.Site(LoadSimAdminResource(self)))
</span><span class="cx"> self.reactor.run()
</span><span class="lines">@@ -417,16 +466,65 @@
</span><span class="cx">
</span><span class="cx"> def stop(self):
</span><span class="cx"> if self.ms.running:
</span><ins>+ self.updateStats()
</ins><span class="cx"> self.ms.stopService()
</span><del>- self.reactor.callLater(5, self.reactor.stop)
</del><ins>+ self.reactor.callLater(5, self.stopAndReport)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def shutdown(self):
</span><span class="cx"> if self.ms.running:
</span><ins>+ self.updateStats()
</ins><span class="cx"> return self.ms.stopService()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def updateStats(self):
+ """
+ Capture server stats and stop.
+ """
</ins><span class="cx">
</span><ins>+ if self.serverStats is not None:
+ _ignore_scheme, hostname, _ignore_path, _ignore_query, _ignore_fragment = urlsplit(self.server)
+ data = self.readStatsSock((hostname.split(":")[0], self.serverStats["Port"],), True)
+ if "Failed" not in data:
+ data = data["5 Minutes"]
+ result = (
+ safeDivision(float(data["requests"]), 5 * 60),
+ safeDivision(data["t"], data["requests"]),
+ safeDivision(float(data["slots"]), data["requests"]),
+ safeDivision(data["cpu"], data["requests"]),
+ )
+ msg(type="sim-expired", reason=result)
+
+
+ def stopAndReport(self):
+ """
+ Runtime has expired - capture server stats and stop.
+ """
+
+ self.updateStats()
+ self.reactor.stop()
+
+
+ def readStatsSock(self, sockname, useTCP):
+ try:
+ s = socket.socket(socket.AF_INET if useTCP else socket.AF_UNIX, socket.SOCK_STREAM)
+ s.connect(sockname)
+ data = ""
+ while True:
+ d = s.recv(1024)
+ if d:
+ data += d
+ else:
+ break
+ s.close()
+ data = json.loads(data)
+ except socket.error:
+ data = {"Failed": "Unable to read statistics from server: %s" % (sockname,)}
+ data["Server"] = sockname
+ return data
+
+
+
</ins><span class="cx"> def attachService(reactor, loadsim, service):
</span><span class="cx"> """
</span><span class="cx"> Attach a given L{IService} provider to the given L{IReactorCore}; cause it
</span><span class="lines">@@ -557,7 +655,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def errReceived(self, error):
</span><del>- from twisted.python.log import msg
</del><span class="cx"> msg("stderr received from " + str(self.transport.pid))
</span><span class="cx"> msg(" " + repr(error))
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadteststandardconfigseventsonlyplist"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/events-only.plist (11836 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/standard-configs/events-only.plist        2013-10-28 17:49:59 UTC (rev 11836)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/events-only.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -1,440 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2011-2012 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-        <dict>
-                <!-- Define the kinds of software and user behavior the load simulation
-                        will simulate. -->
-                <key>clients</key>
-
-                <!-- Have as many different kinds of software and user behavior configurations
-                        as you want. Each is a dict -->
-                <array>
-
-                        <dict>
-
-                                <!-- Here is a Lion iCal simulator. -->
-                                <key>software</key>
-                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
-
-                                <!-- Arguments to use to initialize the client instance. -->
-                                <key>params</key>
-                                <dict>
-                                        <!-- Name that appears in logs. -->
-                                        <key>title</key>
-                                        <string>10.7</string>
-
-                                        <!-- Client can poll the calendar home at some interval. This is
-                                                in seconds. -->
-                                        <key>calendarHomePollInterval</key>
-                                        <integer>300000</integer>
-
-                                        <!-- If the server advertises xmpp push, OS X 10.6 can wait for notifications
-                                                about calendar home changes instead of polling for them periodically. If
-                                                this option is true, then look for the server advertisement for xmpp push
-                                                and use it if possible. Still fall back to polling if there is no xmpp push
-                                                advertised. -->
-                                        <key>supportPush</key>
-                                        <false />
-                                        <key>supportAmpPush</key>
-                                        <false />
-                                </dict>
-
-                                <!-- The profiles define certain types of user behavior on top of the
-                                        client software being simulated. -->
-                                <key>profiles</key>
-                                <array>
-
-                                        <!-- First an event-creating profile, which will periodically create
-                                                new events at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new event. -->
-                                                        <key>interval</key>
-                                                        <integer>20</integer>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <false/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile invites some number of new attendees to new events. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the frequency at which new invitations will be sent out. -->
-                                                        <key>sendInvitationDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.NormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mu gives the mean of the normal distribution (in seconds). -->
-                                                                        <key>mu</key>
-                                                                        <integer>10</integer>
-
-                                                                        <!-- and sigma gives its standard deviation. -->
-                                                                        <key>sigma</key>
-                                                                        <integer>5</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define the distribution of who will be invited to an event.
-                                                        
-                                                                When inviteeClumping is turned on each invitee is based on a sample of
-                                                                users "close to" the organizer based on account index. If the clumping
-                                                                is too "tight" for the requested number of attendees, then invites for
-                                                                those larger numbers will simply fail (the sim will report that situation).
-                                                                
-                                                                When inviteeClumping is off invitees will be sampled across an entire
-                                                                range of account indexes. In this case the distribution ought to be a
-                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
-                                                        -->
-                                                        <key>inviteeDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
-                                                                        <key>min</key>
-                                                                        <integer>0</integer>
-                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
-                                                                        <key>max</key>
-                                                                        <integer>99</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <key>inviteeClumping</key>
-                                                        <true/>
-
-                                                        <!-- Define the distribution of how many attendees will be invited to an event.
-                                                        
-                                                                LogNormal is the best fit to observed data.
-
-
-                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
-                                                                mode should typically be 1, and mean whatever matches the user behavior.
-                                                                Our typical mean is 6.                                                         
-                                                         -->
-                                                        <key>inviteeCountDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mode - peak-->
-                                                                        <key>mode</key>
-                                                                        <integer>1</integer>
-                                                                        <!-- mean - average-->
-                                                                        <key>median</key>
-                                                                        <integer>6</integer>
-                                                                        <!-- maximum -->
-                                                                        <key>maximum</key>
-                                                                        <real>100</real>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <true/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile accepts invitations to events, handles cancels, and
-                                         handles replies received. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define how long to wait after seeing a new invitation before
-                                                                accepting it.
-
-                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
-                                                                (i.e., half of the user have accepted by that time).                                                                
-                                                        -->
-                                                        <key>acceptDelayDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mode - peak-->
-                                                                        <key>mode</key>
-                                                                        <integer>300</integer>
-                                                                        <!-- median - 50% done-->
-                                                                        <key>median</key>
-                                                                        <integer>1800</integer>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- A task-creating profile, which will periodically create
-                                                new tasks at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new task. -->
-                                                        <key>interval</key>
-                                                        <integer>300</integer>
-
-                                                        <!-- Define how due times (DUE) for the randomly generated tasks
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>taskDueDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                </array>
-
-                                <!-- Determine the frequency at which this client configuration will
-                                        appear in the clients which are created by the load tester. -->
-                                <key>weight</key>
-                                <integer>1</integer>
-                        </dict>
-                </array>
-        </dict>
-</plist>
</del></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadteststandardconfigseventsonlyplistfromrev11836CalendarServerbranchesuserscdabooperformancetweakscontribperformanceloadteststandardconfigseventsonlyplist"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/events-only.plist (from rev 11836, CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/standard-configs/events-only.plist) (0 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/standard-configs/events-only.plist         (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/events-only.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -0,0 +1,440 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2012 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+        <dict>
+                <!-- Define the kinds of software and user behavior the load simulation
+                        will simulate. -->
+                <key>clients</key>
+
+                <!-- Have as many different kinds of software and user behavior configurations
+                        as you want. Each is a dict -->
+                <array>
+
+                        <dict>
+
+                                <!-- Here is a Lion iCal simulator. -->
+                                <key>software</key>
+                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
+
+                                <!-- Arguments to use to initialize the client instance. -->
+                                <key>params</key>
+                                <dict>
+                                        <!-- Name that appears in logs. -->
+                                        <key>title</key>
+                                        <string>10.7</string>
+
+                                        <!-- Client can poll the calendar home at some interval. This is
+                                                in seconds. -->
+                                        <key>calendarHomePollInterval</key>
+                                        <integer>300000</integer>
+
+                                        <!-- If the server advertises xmpp push, OS X 10.6 can wait for notifications
+                                                about calendar home changes instead of polling for them periodically. If
+                                                this option is true, then look for the server advertisement for xmpp push
+                                                and use it if possible. Still fall back to polling if there is no xmpp push
+                                                advertised. -->
+                                        <key>supportPush</key>
+                                        <false />
+                                        <key>supportAmpPush</key>
+                                        <false />
+                                </dict>
+
+                                <!-- The profiles define certain types of user behavior on top of the
+                                        client software being simulated. -->
+                                <key>profiles</key>
+                                <array>
+
+                                        <!-- First an event-creating profile, which will periodically create
+                                                new events at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new event. -->
+                                                        <key>interval</key>
+                                                        <integer>20</integer>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <false/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+                                                                                
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+                                                                                
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+                                                                                
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile invites some number of new attendees to new events. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the frequency at which new invitations will be sent out. -->
+                                                        <key>sendInvitationDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.NormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mu gives the mean of the normal distribution (in seconds). -->
+                                                                        <key>mu</key>
+                                                                        <integer>10</integer>
+
+                                                                        <!-- and sigma gives its standard deviation. -->
+                                                                        <key>sigma</key>
+                                                                        <integer>5</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define the distribution of who will be invited to an event.
+                                                        
+                                                                When inviteeClumping is turned on each invitee is based on a sample of
+                                                                users "close to" the organizer based on account index. If the clumping
+                                                                is too "tight" for the requested number of attendees, then invites for
+                                                                those larger numbers will simply fail (the sim will report that situation).
+                                                                
+                                                                When inviteeClumping is off invitees will be sampled across an entire
+                                                                range of account indexes. In this case the distribution ought to be a
+                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
+                                                        -->
+                                                        <key>inviteeDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
+                                                                        <key>min</key>
+                                                                        <integer>0</integer>
+                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
+                                                                        <key>max</key>
+                                                                        <integer>99</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <key>inviteeClumping</key>
+                                                        <true/>
+
+                                                        <!-- Define the distribution of how many attendees will be invited to an event.
+                                                        
+                                                                LogNormal is the best fit to observed data.
+
+
+                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
+                                                                mode should typically be 1, and mean whatever matches the user behavior.
+                                                                Our typical mean is 6.                                                         
+                                                         -->
+                                                        <key>inviteeCountDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mode - peak-->
+                                                                        <key>mode</key>
+                                                                        <integer>1</integer>
+                                                                        <!-- mean - average-->
+                                                                        <key>median</key>
+                                                                        <integer>6</integer>
+                                                                        <!-- maximum -->
+                                                                        <key>maximum</key>
+                                                                        <real>100</real>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <true/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+                                                                                
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+                                                                                
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+                                                                                
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile accepts invitations to events, handles cancels, and
+                                         handles replies received. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define how long to wait after seeing a new invitation before
+                                                                accepting it.
+
+                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
+                                                                (i.e., half of the user have accepted by that time).                                                                
+                                                        -->
+                                                        <key>acceptDelayDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mode - peak-->
+                                                                        <key>mode</key>
+                                                                        <integer>300</integer>
+                                                                        <!-- median - 50% done-->
+                                                                        <key>median</key>
+                                                                        <integer>1800</integer>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- A task-creating profile, which will periodically create
+                                                new tasks at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new task. -->
+                                                        <key>interval</key>
+                                                        <integer>300</integer>
+
+                                                        <!-- Define how due times (DUE) for the randomly generated tasks
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>taskDueDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                </array>
+
+                                <!-- Determine the frequency at which this client configuration will
+                                        appear in the clients which are created by the load tester. -->
+                                <key>weight</key>
+                                <integer>1</integer>
+                        </dict>
+                </array>
+        </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesacceptsplist"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-accepts.plist (11836 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/standard-configs/invites-accepts.plist        2013-10-28 17:49:59 UTC (rev 11836)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-accepts.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -1,419 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2011-2012 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-        <dict>
-                <!-- Define the kinds of software and user behavior the load simulation
-                        will simulate. -->
-                <key>clients</key>
-
-                <!-- Have as many different kinds of software and user behavior configurations
-                        as you want. Each is a dict -->
-                <array>
-
-                        <dict>
-
-                                <!-- Here is a Lion iCal simulator. -->
-                                <key>software</key>
-                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
-
-                                <!-- Arguments to use to initialize the client instance. -->
-                                <key>params</key>
-                                <dict>
-                                        <!-- Name that appears in logs. -->
-                                        <key>title</key>
-                                        <string>10.7</string>
-
-                                        <!-- Client can poll the calendar home at some interval. This is
-                                                in seconds. -->
-                                        <key>calendarHomePollInterval</key>
-                                        <integer>300000</integer>
-
-                                        <!-- If the server advertises xmpp push, OS X 10.6 can wait for notifications
-                                                about calendar home changes instead of polling for them periodically. If
-                                                this option is true, then look for the server advertisement for xmpp push
-                                                and use it if possible. Still fall back to polling if there is no xmpp push
-                                                advertised. -->
-                                        <key>supportPush</key>
-                                        <false />
-                                        <key>supportAmpPush</key>
-                                        <true />
-                                </dict>
-
-                                <!-- The profiles define certain types of user behavior on top of the
-                                        client software being simulated. -->
-                                <key>profiles</key>
-                                <array>
-
-                                        <!-- First an event-creating profile, which will periodically create
-                                                new events at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new event. -->
-                                                        <key>interval</key>
-                                                        <integer>20</integer>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <false/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile invites some number of new attendees to new events. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the frequency at which new invitations will be sent out. -->
-                                                        <key>sendInvitationDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.FixedDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- interval (in seconds). -->
-                                                                        <key>value</key>
-                                                                        <integer>150</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define the distribution of who will be invited to an event.
-                                                        
-                                                                When inviteeClumping is turned on each invitee is based on a sample of
-                                                                users "close to" the organizer based on account index. If the clumping
-                                                                is too "tight" for the requested number of attendees, then invites for
-                                                                those larger numbers will simply fail (the sim will report that situation).
-                                                                
-                                                                When inviteeClumping is off invitees will be sampled across an entire
-                                                                range of account indexes. In this case the distribution ought to be a
-                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
-                                                        -->
-                                                        <key>inviteeDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
-                                                                        <key>min</key>
-                                                                        <integer>0</integer>
-                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
-                                                                        <key>max</key>
-                                                                        <integer>99</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <key>inviteeClumping</key>
-                                                        <true/>
-
-                                                        <!-- Define the distribution of how many attendees will be invited to an event.
-                                                        
-                                                                LogNormal is the best fit to observed data.
-
-
-                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
-                                                                mode should typically be 1, and mean whatever matches the user behavior.
-                                                                Our typical mean is 6.                                                         
-                                                         -->
-                                                        <key>inviteeCountDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.FixedDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- Number of attendees. -->
-                                                                        <key>value</key>
-                                                                        <integer>5</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <false/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>100</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile accepts invitations to events, handles cancels, and
-                                         handles replies received. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define how long to wait after seeing a new invitation before
-                                                                accepting it.
-
-                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
-                                                                (i.e., half of the user have accepted by that time).                                                                
-                                                        -->
-                                                        <key>acceptDelayDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.UniformDiscreteDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- Set of values to use - will be chosen in random order. -->
-                                                                        <key>values</key>
-                                                                        <array>
-                                                                                <integer>0</integer>
-                                                                                <integer>5</integer>
-                                                                                <integer>10</integer>
-                                                                                <integer>15</integer>
-                                                                                <integer>20</integer>
-                                                                                <integer>25</integer>
-                                                                                <integer>30</integer>
-                                                                        </array>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- A task-creating profile, which will periodically create
-                                                new tasks at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new task. -->
-                                                        <key>interval</key>
-                                                        <integer>300</integer>
-
-                                                        <!-- Define how due times (DUE) for the randomly generated tasks
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>taskDueDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                </array>
-
-                                <!-- Determine the frequency at which this client configuration will
-                                        appear in the clients which are created by the load tester. -->
-                                <key>weight</key>
-                                <integer>1</integer>
-                        </dict>
-                </array>
-
-                <!-- Determine the interval between client creation. -->
-                <key>arrivalInterval</key>
-                <integer>5</integer>
-        </dict>
-</plist>
</del></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesacceptsplistfromrev11836CalendarServerbranchesuserscdabooperformancetweakscontribperformanceloadteststandardconfigsinvitesacceptsplist"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-accepts.plist (from rev 11836, CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/standard-configs/invites-accepts.plist) (0 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-accepts.plist         (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-accepts.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -0,0 +1,419 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2012 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+        <dict>
+                <!-- Define the kinds of software and user behavior the load simulation
+                        will simulate. -->
+                <key>clients</key>
+
+                <!-- Have as many different kinds of software and user behavior configurations
+                        as you want. Each is a dict -->
+                <array>
+
+                        <dict>
+
+                                <!-- Here is a Lion iCal simulator. -->
+                                <key>software</key>
+                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
+
+                                <!-- Arguments to use to initialize the client instance. -->
+                                <key>params</key>
+                                <dict>
+                                        <!-- Name that appears in logs. -->
+                                        <key>title</key>
+                                        <string>10.7</string>
+
+                                        <!-- Client can poll the calendar home at some interval. This is
+                                                in seconds. -->
+                                        <key>calendarHomePollInterval</key>
+                                        <integer>300000</integer>
+
+                                        <!-- If the server advertises xmpp push, OS X 10.6 can wait for notifications
+                                                about calendar home changes instead of polling for them periodically. If
+                                                this option is true, then look for the server advertisement for xmpp push
+                                                and use it if possible. Still fall back to polling if there is no xmpp push
+                                                advertised. -->
+                                        <key>supportPush</key>
+                                        <false />
+                                        <key>supportAmpPush</key>
+                                        <true />
+                                </dict>
+
+                                <!-- The profiles define certain types of user behavior on top of the
+                                        client software being simulated. -->
+                                <key>profiles</key>
+                                <array>
+
+                                        <!-- First an event-creating profile, which will periodically create
+                                                new events at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new event. -->
+                                                        <key>interval</key>
+                                                        <integer>20</integer>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <false/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+                                                                                
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+                                                                                
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+                                                                                
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile invites some number of new attendees to new events. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the frequency at which new invitations will be sent out. -->
+                                                        <key>sendInvitationDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.FixedDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- interval (in seconds). -->
+                                                                        <key>value</key>
+                                                                        <integer>150</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define the distribution of who will be invited to an event.
+                                                        
+                                                                When inviteeClumping is turned on each invitee is based on a sample of
+                                                                users "close to" the organizer based on account index. If the clumping
+                                                                is too "tight" for the requested number of attendees, then invites for
+                                                                those larger numbers will simply fail (the sim will report that situation).
+                                                                
+                                                                When inviteeClumping is off invitees will be sampled across an entire
+                                                                range of account indexes. In this case the distribution ought to be a
+                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
+                                                        -->
+                                                        <key>inviteeDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
+                                                                        <key>min</key>
+                                                                        <integer>0</integer>
+                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
+                                                                        <key>max</key>
+                                                                        <integer>99</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <key>inviteeClumping</key>
+                                                        <true/>
+
+                                                        <!-- Define the distribution of how many attendees will be invited to an event.
+                                                        
+                                                                LogNormal is the best fit to observed data.
+
+
+                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
+                                                                mode should typically be 1, and mean whatever matches the user behavior.
+                                                                Our typical mean is 6.                                                         
+                                                         -->
+                                                        <key>inviteeCountDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.FixedDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- Number of attendees. -->
+                                                                        <key>value</key>
+                                                                        <integer>5</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <false/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>100</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile accepts invitations to events, handles cancels, and
+                                         handles replies received. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define how long to wait after seeing a new invitation before
+                                                                accepting it.
+
+                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
+                                                                (i.e., half of the user have accepted by that time).                                                                
+                                                        -->
+                                                        <key>acceptDelayDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.UniformDiscreteDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- Set of values to use - will be chosen in random order. -->
+                                                                        <key>values</key>
+                                                                        <array>
+                                                                                <integer>0</integer>
+                                                                                <integer>5</integer>
+                                                                                <integer>10</integer>
+                                                                                <integer>15</integer>
+                                                                                <integer>20</integer>
+                                                                                <integer>25</integer>
+                                                                                <integer>30</integer>
+                                                                        </array>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- A task-creating profile, which will periodically create
+                                                new tasks at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new task. -->
+                                                        <key>interval</key>
+                                                        <integer>300</integer>
+
+                                                        <!-- Define how due times (DUE) for the randomly generated tasks
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>taskDueDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                </array>
+
+                                <!-- Determine the frequency at which this client configuration will
+                                        appear in the clients which are created by the load tester. -->
+                                <key>weight</key>
+                                <integer>1</integer>
+                        </dict>
+                </array>
+
+                <!-- Determine the interval between client creation. -->
+                <key>arrivalInterval</key>
+                <integer>5</integer>
+        </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesonlyrecurringplist"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist (11836 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist        2013-10-28 17:49:59 UTC (rev 11836)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -1,414 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2011-2012 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-        <dict>
-                <!-- Define the kinds of software and user behavior the load simulation
-                        will simulate. -->
-                <key>clients</key>
-
-                <!-- Have as many different kinds of software and user behavior configurations
-                        as you want. Each is a dict -->
-                <array>
-
-                        <dict>
-
-                                <!-- Here is a Lion iCal simulator. -->
-                                <key>software</key>
-                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
-
-                                <!-- Arguments to use to initialize the client instance. -->
-                                <key>params</key>
-                                <dict>
-                                        <!-- Name that appears in logs. -->
-                                        <key>title</key>
-                                        <string>10.7</string>
-
-                                        <!-- Client can poll the calendar home at some interval. This is
-                                                in seconds. -->
-                                        <key>calendarHomePollInterval</key>
-                                        <integer>300000</integer>
-
-                                        <!-- If the server advertises xmpp push, OS X 10.6 can wait for notifications
-                                                about calendar home changes instead of polling for them periodically. If
-                                                this option is true, then look for the server advertisement for xmpp push
-                                                and use it if possible. Still fall back to polling if there is no xmpp push
-                                                advertised. -->
-                                        <key>supportPush</key>
-                                        <false />
-                                        <key>supportAmpPush</key>
-                                        <false />
-                                </dict>
-
-                                <!-- The profiles define certain types of user behavior on top of the
-                                        client software being simulated. -->
-                                <key>profiles</key>
-                                <array>
-
-                                        <!-- First an event-creating profile, which will periodically create
-                                                new events at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new event. -->
-                                                        <key>interval</key>
-                                                        <integer>20</integer>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <false/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile invites some number of new attendees to new events. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the frequency at which new invitations will be sent out. -->
-                                                        <key>sendInvitationDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.FixedDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- interval (in seconds). -->
-                                                                        <key>value</key>
-                                                                        <integer>120</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define the distribution of who will be invited to an event.
-                                                        
-                                                                When inviteeClumping is turned on each invitee is based on a sample of
-                                                                users "close to" the organizer based on account index. If the clumping
-                                                                is too "tight" for the requested number of attendees, then invites for
-                                                                those larger numbers will simply fail (the sim will report that situation).
-                                                                
-                                                                When inviteeClumping is off invitees will be sampled across an entire
-                                                                range of account indexes. In this case the distribution ought to be a
-                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
-                                                        -->
-                                                        <key>inviteeDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
-                                                                        <key>min</key>
-                                                                        <integer>0</integer>
-                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
-                                                                        <key>max</key>
-                                                                        <integer>99</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <key>inviteeClumping</key>
-                                                        <true/>
-
-                                                        <!-- Define the distribution of how many attendees will be invited to an event.
-                                                        
-                                                                LogNormal is the best fit to observed data.
-
-
-                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
-                                                                mode should typically be 1, and mean whatever matches the user behavior.
-                                                                Our typical mean is 6.                                                         
-                                                         -->
-                                                        <key>inviteeCountDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.FixedDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- Number of attendees. -->
-                                                                        <key>value</key>
-                                                                        <integer>5</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <true/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>100</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile accepts invitations to events, handles cancels, and
-                                         handles replies received. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define how long to wait after seeing a new invitation before
-                                                                accepting it.
-
-                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
-                                                                (i.e., half of the user have accepted by that time).                                                                
-                                                        -->
-                                                        <key>acceptDelayDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mode - peak-->
-                                                                        <key>mode</key>
-                                                                        <integer>300</integer>
-                                                                        <!-- median - 50% done-->
-                                                                        <key>median</key>
-                                                                        <integer>1800</integer>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- A task-creating profile, which will periodically create
-                                                new tasks at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new task. -->
-                                                        <key>interval</key>
-                                                        <integer>300</integer>
-
-                                                        <!-- Define how due times (DUE) for the randomly generated tasks
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>taskDueDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                </array>
-
-                                <!-- Determine the frequency at which this client configuration will
-                                        appear in the clients which are created by the load tester. -->
-                                <key>weight</key>
-                                <integer>1</integer>
-                        </dict>
-                </array>
-
-                <!-- Determine the interval between client creation. -->
-                <key>arrivalInterval</key>
-                <integer>4</integer>
-        </dict>
-</plist>
</del></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesonlyrecurringplistfromrev11836CalendarServerbranchesuserscdabooperformancetweakscontribperformanceloadteststandardconfigsinvitesonlyrecurringplist"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist (from rev 11836, CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist) (0 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist         (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -0,0 +1,414 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2012 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+        <dict>
+                <!-- Define the kinds of software and user behavior the load simulation
+                        will simulate. -->
+                <key>clients</key>
+
+                <!-- Have as many different kinds of software and user behavior configurations
+                        as you want. Each is a dict -->
+                <array>
+
+                        <dict>
+
+                                <!-- Here is a Lion iCal simulator. -->
+                                <key>software</key>
+                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
+
+                                <!-- Arguments to use to initialize the client instance. -->
+                                <key>params</key>
+                                <dict>
+                                        <!-- Name that appears in logs. -->
+                                        <key>title</key>
+                                        <string>10.7</string>
+
+                                        <!-- Client can poll the calendar home at some interval. This is
+                                                in seconds. -->
+                                        <key>calendarHomePollInterval</key>
+                                        <integer>300000</integer>
+
+                                        <!-- If the server advertises xmpp push, OS X 10.6 can wait for notifications
+                                                about calendar home changes instead of polling for them periodically. If
+                                                this option is true, then look for the server advertisement for xmpp push
+                                                and use it if possible. Still fall back to polling if there is no xmpp push
+                                                advertised. -->
+                                        <key>supportPush</key>
+                                        <false />
+                                        <key>supportAmpPush</key>
+                                        <false />
+                                </dict>
+
+                                <!-- The profiles define certain types of user behavior on top of the
+                                        client software being simulated. -->
+                                <key>profiles</key>
+                                <array>
+
+                                        <!-- First an event-creating profile, which will periodically create
+                                                new events at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new event. -->
+                                                        <key>interval</key>
+                                                        <integer>20</integer>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <false/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+                                                                                
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+                                                                                
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+                                                                                
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile invites some number of new attendees to new events. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the frequency at which new invitations will be sent out. -->
+                                                        <key>sendInvitationDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.FixedDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- interval (in seconds). -->
+                                                                        <key>value</key>
+                                                                        <integer>120</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define the distribution of who will be invited to an event.
+                                                        
+                                                                When inviteeClumping is turned on each invitee is based on a sample of
+                                                                users "close to" the organizer based on account index. If the clumping
+                                                                is too "tight" for the requested number of attendees, then invites for
+                                                                those larger numbers will simply fail (the sim will report that situation).
+                                                                
+                                                                When inviteeClumping is off invitees will be sampled across an entire
+                                                                range of account indexes. In this case the distribution ought to be a
+                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
+                                                        -->
+                                                        <key>inviteeDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
+                                                                        <key>min</key>
+                                                                        <integer>0</integer>
+                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
+                                                                        <key>max</key>
+                                                                        <integer>99</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <key>inviteeClumping</key>
+                                                        <true/>
+
+                                                        <!-- Define the distribution of how many attendees will be invited to an event.
+                                                        
+                                                                LogNormal is the best fit to observed data.
+
+
+                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
+                                                                mode should typically be 1, and mean whatever matches the user behavior.
+                                                                Our typical mean is 6.                                                         
+                                                         -->
+                                                        <key>inviteeCountDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.FixedDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- Number of attendees. -->
+                                                                        <key>value</key>
+                                                                        <integer>5</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <true/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>100</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile accepts invitations to events, handles cancels, and
+                                         handles replies received. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define how long to wait after seeing a new invitation before
+                                                                accepting it.
+
+                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
+                                                                (i.e., half of the user have accepted by that time).                                                                
+                                                        -->
+                                                        <key>acceptDelayDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mode - peak-->
+                                                                        <key>mode</key>
+                                                                        <integer>300</integer>
+                                                                        <!-- median - 50% done-->
+                                                                        <key>median</key>
+                                                                        <integer>1800</integer>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- A task-creating profile, which will periodically create
+                                                new tasks at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new task. -->
+                                                        <key>interval</key>
+                                                        <integer>300</integer>
+
+                                                        <!-- Define how due times (DUE) for the randomly generated tasks
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>taskDueDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                </array>
+
+                                <!-- Determine the frequency at which this client configuration will
+                                        appear in the clients which are created by the load tester. -->
+                                <key>weight</key>
+                                <integer>1</integer>
+                        </dict>
+                </array>
+
+                <!-- Determine the interval between client creation. -->
+                <key>arrivalInterval</key>
+                <integer>4</integer>
+        </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesonlyplist"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only.plist (11836 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/standard-configs/invites-only.plist        2013-10-28 17:49:59 UTC (rev 11836)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -1,430 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2011-2012 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-        <dict>
-                <!-- Define the kinds of software and user behavior the load simulation
-                        will simulate. -->
-                <key>clients</key>
-
-                <!-- Have as many different kinds of software and user behavior configurations
-                        as you want. Each is a dict -->
-                <array>
-
-                        <dict>
-
-                                <!-- Here is a Lion iCal simulator. -->
-                                <key>software</key>
-                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
-
-                                <!-- Arguments to use to initialize the client instance. -->
-                                <key>params</key>
-                                <dict>
-                                        <!-- Name that appears in logs. -->
-                                        <key>title</key>
-                                        <string>10.7</string>
-
-                                        <!-- Client can poll the calendar home at some interval. This is
-                                                in seconds. -->
-                                        <key>calendarHomePollInterval</key>
-                                        <integer>300000</integer>
-
-                                        <!-- If the server advertises xmpp push, OS X 10.6 can wait for notifications
-                                                about calendar home changes instead of polling for them periodically. If
-                                                this option is true, then look for the server advertisement for xmpp push
-                                                and use it if possible. Still fall back to polling if there is no xmpp push
-                                                advertised. -->
-                                        <key>supportPush</key>
-                                        <false />
-                                        <key>supportAmpPush</key>
-                                        <false />
-                                </dict>
-
-                                <!-- The profiles define certain types of user behavior on top of the
-                                        client software being simulated. -->
-                                <key>profiles</key>
-                                <array>
-
-                                        <!-- First an event-creating profile, which will periodically create
-                                                new events at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new event. -->
-                                                        <key>interval</key>
-                                                        <integer>20</integer>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <false/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile invites some number of new attendees to new events. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <true/>
-
-                                                        <!-- Define the frequency at which new invitations will be sent out. -->
-                                                        <key>sendInvitationDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.FixedDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- interval (in seconds). -->
-                                                                        <key>value</key>
-                                                                        <integer>120</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define the distribution of who will be invited to an event.
-                                                        
-                                                                When inviteeClumping is turned on each invitee is based on a sample of
-                                                                users "close to" the organizer based on account index. If the clumping
-                                                                is too "tight" for the requested number of attendees, then invites for
-                                                                those larger numbers will simply fail (the sim will report that situation).
-                                                                
-                                                                When inviteeClumping is off invitees will be sampled across an entire
-                                                                range of account indexes. In this case the distribution ought to be a
-                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
-                                                        -->
-                                                        <key>inviteeDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
-                                                                        <key>min</key>
-                                                                        <integer>0</integer>
-                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
-                                                                        <key>max</key>
-                                                                        <integer>99</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <key>inviteeClumping</key>
-                                                        <true/>
-
-                                                        <!-- Define the distribution of how many attendees will be invited to an event.
-                                                        
-                                                                LogNormal is the best fit to observed data.
-
-
-                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
-                                                                mode should typically be 1, and mean whatever matches the user behavior.
-                                                                Our typical mean is 6.                                                         
-                                                         -->
-                                                        <key>inviteeCountDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.FixedDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- Number of attendees. -->
-                                                                        <key>value</key>
-                                                                        <integer>5</integer>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how start times (DTSTART) for the randomly generated events
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>eventStartDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-
-                                                        <!-- Define how recurrences are created. -->
-                                                        <key>recurrenceDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. We have a fixed set of
-                                                                 RRULEs defined for this distribution and pick each based on a
-                                                                 weight. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- False to disable RRULEs -->
-                                                                        <key>allowRecurrence</key>
-                                                                        <false/>
-
-                                                                        <!-- These are the weights for the specific set of RRULEs. -->
-                                                                        <key>weights</key>
-                                                                        <dict>
-                                                                                <!-- Half of all events will be non-recurring -->
-                                                                                <key>none</key>
-                                                                                <integer>50</integer>
-                                                                                
-                                                                                <!-- Daily and weekly are pretty common -->
-                                                                                <key>daily</key>
-                                                                                <integer>10</integer>
-                                                                                <key>weekly</key>
-                                                                                <integer>20</integer>
-                                                                                
-                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
-                                                                                <key>monthly</key>
-                                                                                <integer>2</integer>
-                                                                                <key>yearly</key>
-                                                                                <integer>1</integer>
-                                                                                <key>dailylimit</key>
-                                                                                <integer>2</integer>
-                                                                                <key>weeklylimit</key>
-                                                                                <integer>5</integer>
-                                                                                
-                                                                                <!-- Work days pretty common -->
-                                                                                <key>workdays</key>
-                                                                                <integer>10</integer>
-                                                                        </dict>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- This profile accepts invitations to events, handles cancels, and
-                                         handles replies received. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define how long to wait after seeing a new invitation before
-                                                                accepting it.
-
-                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
-                                                                (i.e., half of the user have accepted by that time).                                                                
-                                                        -->
-                                                        <key>acceptDelayDistribution</key>
-                                                        <dict>
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- mode - peak-->
-                                                                        <key>mode</key>
-                                                                        <integer>300</integer>
-                                                                        <!-- median - 50% done-->
-                                                                        <key>median</key>
-                                                                        <integer>1800</integer>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                        <!-- A task-creating profile, which will periodically create
-                                                new tasks at a random time on a random calendar. -->
-                                        <dict>
-                                                <key>class</key>
-                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
-
-                                                <key>params</key>
-                                                <dict>
-                                                        <key>enabled</key>
-                                                        <false/>
-
-                                                        <!-- Define the interval (in seconds) at which this profile will use
-                                                                its client to create a new task. -->
-                                                        <key>interval</key>
-                                                        <integer>300</integer>
-
-                                                        <!-- Define how due times (DUE) for the randomly generated tasks
-                                                                will be selected. This is an example of a "Distribution" parameter. The value
-                                                                for most "Distribution" parameters are interchangeable and extensible. -->
-                                                        <key>taskDueDistribution</key>
-                                                        <dict>
-
-                                                                <!-- This distribution is pretty specialized. It produces timestamps
-                                                                        in the near future, limited to certain days of the week and certain hours
-                                                                        of the day. -->
-                                                                <key>type</key>
-                                                                <string>contrib.performance.stats.WorkDistribution</string>
-
-                                                                <key>params</key>
-                                                                <dict>
-                                                                        <!-- These are the days of the week the distribution will use. -->
-                                                                        <key>daysOfWeek</key>
-                                                                        <array>
-                                                                                <string>mon</string>
-                                                                                <string>tue</string>
-                                                                                <string>wed</string>
-                                                                                <string>thu</string>
-                                                                                <string>fri</string>
-                                                                        </array>
-
-                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
-                                                                        <key>beginHour</key>
-                                                                        <integer>8</integer>
-
-                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
-                                                                                to begin!). -->
-                                                                        <key>endHour</key>
-                                                                        <integer>16</integer>
-
-                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
-                                                                                really work right?) -->
-                                                                        <key>tzname</key>
-                                                                        <string>America/Los_Angeles</string>
-                                                                </dict>
-                                                        </dict>
-                                                </dict>
-                                        </dict>
-
-                                </array>
-
-                                <!-- Determine the frequency at which this client configuration will
-                                        appear in the clients which are created by the load tester. -->
-                                <key>weight</key>
-                                <integer>1</integer>
-                        </dict>
-                </array>
-        </dict>
-</plist>
</del></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadteststandardconfigsinvitesonlyplistfromrev11836CalendarServerbranchesuserscdabooperformancetweakscontribperformanceloadteststandardconfigsinvitesonlyplist"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only.plist (from rev 11836, CalendarServer/branches/users/cdaboo/performance-tweaks/contrib/performance/loadtest/standard-configs/invites-only.plist) (0 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only.plist         (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/invites-only.plist        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -0,0 +1,430 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2012 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+        <dict>
+                <!-- Define the kinds of software and user behavior the load simulation
+                        will simulate. -->
+                <key>clients</key>
+
+                <!-- Have as many different kinds of software and user behavior configurations
+                        as you want. Each is a dict -->
+                <array>
+
+                        <dict>
+
+                                <!-- Here is a Lion iCal simulator. -->
+                                <key>software</key>
+                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
+
+                                <!-- Arguments to use to initialize the client instance. -->
+                                <key>params</key>
+                                <dict>
+                                        <!-- Name that appears in logs. -->
+                                        <key>title</key>
+                                        <string>10.7</string>
+
+                                        <!-- Client can poll the calendar home at some interval. This is
+                                                in seconds. -->
+                                        <key>calendarHomePollInterval</key>
+                                        <integer>300000</integer>
+
+                                        <!-- If the server advertises xmpp push, OS X 10.6 can wait for notifications
+                                                about calendar home changes instead of polling for them periodically. If
+                                                this option is true, then look for the server advertisement for xmpp push
+                                                and use it if possible. Still fall back to polling if there is no xmpp push
+                                                advertised. -->
+                                        <key>supportPush</key>
+                                        <false />
+                                        <key>supportAmpPush</key>
+                                        <false />
+                                </dict>
+
+                                <!-- The profiles define certain types of user behavior on top of the
+                                        client software being simulated. -->
+                                <key>profiles</key>
+                                <array>
+
+                                        <!-- First an event-creating profile, which will periodically create
+                                                new events at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new event. -->
+                                                        <key>interval</key>
+                                                        <integer>20</integer>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <false/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+                                                                                
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+                                                                                
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+                                                                                
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile invites some number of new attendees to new events. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.RealisticInviter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the frequency at which new invitations will be sent out. -->
+                                                        <key>sendInvitationDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.FixedDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- interval (in seconds). -->
+                                                                        <key>value</key>
+                                                                        <integer>120</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define the distribution of who will be invited to an event.
+                                                        
+                                                                When inviteeClumping is turned on each invitee is based on a sample of
+                                                                users "close to" the organizer based on account index. If the clumping
+                                                                is too "tight" for the requested number of attendees, then invites for
+                                                                those larger numbers will simply fail (the sim will report that situation).
+                                                                
+                                                                When inviteeClumping is off invitees will be sampled across an entire
+                                                                range of account indexes. In this case the distribution ought to be a
+                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
+                                                        -->
+                                                        <key>inviteeDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
+                                                                        <key>min</key>
+                                                                        <integer>0</integer>
+                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
+                                                                        <key>max</key>
+                                                                        <integer>99</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <key>inviteeClumping</key>
+                                                        <true/>
+
+                                                        <!-- Define the distribution of how many attendees will be invited to an event.
+                                                        
+                                                                LogNormal is the best fit to observed data.
+
+
+                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
+                                                                mode should typically be 1, and mean whatever matches the user behavior.
+                                                                Our typical mean is 6.                                                         
+                                                         -->
+                                                        <key>inviteeCountDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.FixedDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- Number of attendees. -->
+                                                                        <key>value</key>
+                                                                        <integer>5</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <false/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+                                                                                
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+                                                                                
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+                                                                                
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile accepts invitations to events, handles cancels, and
+                                         handles replies received. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define how long to wait after seeing a new invitation before
+                                                                accepting it.
+
+                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
+                                                                (i.e., half of the user have accepted by that time).                                                                
+                                                        -->
+                                                        <key>acceptDelayDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mode - peak-->
+                                                                        <key>mode</key>
+                                                                        <integer>300</integer>
+                                                                        <!-- median - 50% done-->
+                                                                        <key>median</key>
+                                                                        <integer>1800</integer>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- A task-creating profile, which will periodically create
+                                                new tasks at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new task. -->
+                                                        <key>interval</key>
+                                                        <integer>300</integer>
+
+                                                        <!-- Define how due times (DUE) for the randomly generated tasks
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>taskDueDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                </array>
+
+                                <!-- Determine the frequency at which this client configuration will
+                                        appear in the clients which are created by the load tester. -->
+                                <key>weight</key>
+                                <integer>1</integer>
+                        </dict>
+                </array>
+        </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_simpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_sim.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_sim.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_sim.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> exc = self.assertRaises(
</span><span class="cx"> SystemExit, StubSimulator.main, ['--config', config.path])
</span><span class="cx"> self.assertEquals(
</span><del>- exc.args, (StubSimulator(None, None, None, None, None, None).run(),))
</del><ins>+ exc.args, (StubSimulator(None, None, None, None, None, None, None).run(),))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_createSimulator(self):
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> """
</span><span class="cx"> server = 'http://127.0.0.7:1243/'
</span><span class="cx"> reactor = object()
</span><del>- sim = LoadSimulator(server, None, None, None, None, None, reactor=reactor)
</del><ins>+ sim = LoadSimulator(server, None, None, None, None, None, None, reactor=reactor)
</ins><span class="cx"> calsim = sim.createSimulator()
</span><span class="cx"> self.assertIsInstance(calsim, CalendarClientSimulator)
</span><span class="cx"> self.assertIsInstance(calsim.reactor, LagTrackingReactor)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx">
</span><span class="cx"> reactor = object()
</span><span class="cx"> sim = LoadSimulator(
</span><del>- None, None, None, None, Arrival(FakeArrival, {'x': 3, 'y': 2}), None, reactor=reactor)
</del><ins>+ None, None, None, None, None, Arrival(FakeArrival, {'x': 3, 'y': 2}), None, reactor=reactor)
</ins><span class="cx"> arrival = sim.createArrivalPolicy()
</span><span class="cx"> self.assertIsInstance(arrival, FakeArrival)
</span><span class="cx"> self.assertIdentical(arrival.reactor, sim.reactor)
</span><span class="lines">@@ -478,7 +478,9 @@
</span><span class="cx"> "weight": 3,
</span><span class="cx"> }]}))
</span><span class="cx">
</span><del>- sim = LoadSimulator.fromCommandLine(['--config', config.path])
</del><ins>+ sim = LoadSimulator.fromCommandLine(
+ ['--config', config.path, '--clients', config.path]
+ )
</ins><span class="cx"> expectedParameters = PopulationParameters()
</span><span class="cx"> expectedParameters.addClient(
</span><span class="cx"> 3, ClientType(OS_X_10_6, {"foo": "bar"}, [ProfileType(Eventer, {
</span><span class="lines">@@ -495,7 +497,9 @@
</span><span class="cx"> """
</span><span class="cx"> config = FilePath(self.mktemp())
</span><span class="cx"> config.setContent(writePlistToString({"clients": []}))
</span><del>- sim = LoadSimulator.fromCommandLine(['--config', config.path])
</del><ins>+ sim = LoadSimulator.fromCommandLine(
+ ['--config', config.path, '--clients', config.path]
+ )
</ins><span class="cx"> expectedParameters = PopulationParameters()
</span><span class="cx"> expectedParameters.addClient(
</span><span class="cx"> 1, ClientType(OS_X_10_6, {}, [Eventer, Inviter, Accepter]))
</span><span class="lines">@@ -528,6 +532,7 @@
</span><span class="cx"> "/principals/users/%s/",
</span><span class="cx"> None,
</span><span class="cx"> None,
</span><ins>+ None,
</ins><span class="cx"> Arrival(lambda reactor: NullArrival(), {}),
</span><span class="cx"> None, observers, reactor=Reactor())
</span><span class="cx"> io = StringIO()
</span></span></pre></div>
<a id="CalendarServertrunkcontribtoolsfix_calendar"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/tools/fix_calendar (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/tools/fix_calendar        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/contrib/tools/fix_calendar        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> def usage():
</span><span class="cx"> print """Usage: xattr_fix CALENDARS
</span><span class="cx"> Options:
</span><del>-
</del><ins>+
</ins><span class="cx"> CALENDARS - a list of directories that are to be treated as calendars
</span><del>-
</del><ins>+
</ins><span class="cx"> Description:
</span><span class="cx"> This utility will add xattrs to the specified directories and their contents
</span><span class="cx"> to make them appear to be calendars and calendar resources when used with
</span><span class="lines">@@ -40,8 +40,10 @@
</span><span class="cx"> root without properly preserving the xattrs.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> def fixCalendar(path):
</span><del>-
</del><ins>+
</ins><span class="cx"> # First fix the resourcetype & getctag on the calendar
</span><span class="cx"> x = xattr.xattr(path)
</span><span class="cx"> x["WebDAV:{DAV:}resourcetype"] = """<?xml version='1.0' encoding='UTF-8'?>
</span><span class="lines">@@ -60,7 +62,7 @@
</span><span class="cx"> if not child.endswith(".ics"):
</span><span class="cx"> continue
</span><span class="cx"> fullpath = os.path.join(path, child)
</span><del>-
</del><ins>+
</ins><span class="cx"> # getcontenttype
</span><span class="cx"> x = xattr.xattr(fullpath)
</span><span class="cx"> x["WebDAV:{DAV:}getcontenttype"] = """<?xml version='1.0' encoding='UTF-8'?>
</span><span class="lines">@@ -94,7 +96,7 @@
</span><span class="cx"> if not os.path.exists(arg):
</span><span class="cx"> print "Path does not exist: '%s'. Ignoring." % (arg,)
</span><span class="cx"> continue
</span><del>-
</del><ins>+
</ins><span class="cx"> if os.path.basename(arg) in ("inbox", "outbox", "dropbox",):
</span><span class="cx"> print "Cannot be used on inbox, outbox or dropbox."
</span><span class="cx"> continue
</span><span class="lines">@@ -103,4 +105,3 @@
</span><span class="cx">
</span><span class="cx"> except Exception, e:
</span><span class="cx"> sys.exit(str(e))
</span><del>-
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/twistedcaldav/resource.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -333,6 +333,12 @@
</span><span class="cx"> else:
</span><span class="cx"> yield transaction.commit()
</span><span class="cx">
</span><ins>+ # Log extended item
+ if transaction.logItems:
+ if not hasattr(request, "extendedLogItems"):
+ request.extendedLogItems = {}
+ request.extendedLogItems.update(transaction.logItems)
+
</ins><span class="cx"> # May need to reset the last-modified header in the response as txn.commit() can change it due to pre-commit hooks
</span><span class="cx"> if response.headers.hasHeader("last-modified"):
</span><span class="cx"> response.headers.setHeader("last-modified", self.lastModified())
</span><span class="lines">@@ -2551,15 +2557,6 @@
</span><span class="cx"> return self._newStoreHome.hasCalendarResourceUIDSomewhereElse(uid, ok_object._newStoreObject, mode)
</span><span class="cx">
</span><span class="cx">
</span><del>- def getCalendarResourcesForUID(self, uid, allow_shared=False):
- """
- Return all child object resources with the specified UID.
-
- Pass through direct to store.
- """
- return self._newStoreHome.getCalendarResourcesForUID(uid, allow_shared)
-
-
</del><span class="cx"> def defaultAccessControlList(self):
</span><span class="cx"> myPrincipal = self.principalForRecord()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavscheduling_storecaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -422,8 +422,12 @@
</span><span class="cx"> authz = (yield request.locateResource(principalURL))
</span><span class="cx"> self._associatedTransaction._authz_uid = authz.record.guid
</span><span class="cx">
</span><ins>+ # Log extended item
+ if not hasattr(request, "extendedLogItems"):
+ request.extendedLogItems = {}
+
</ins><span class="cx"> # This is a local CALDAV scheduling operation.
</span><del>- scheduler = CalDAVScheduler(self._associatedTransaction, self.parent._newStoreHome.uid())
</del><ins>+ scheduler = CalDAVScheduler(self._associatedTransaction, self.parent._newStoreHome.uid(), logItems=request.extendedLogItems)
</ins><span class="cx">
</span><span class="cx"> # Do the POST processing treating
</span><span class="cx"> result = (yield scheduler.doSchedulingViaPOST(originator, recipients, calendar))
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoreutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/util.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/util.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/txdav/base/datastore/util.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -92,6 +92,12 @@
</span><span class="cx"> return "objectWithName:%s:%s" % (homeResourceID, name)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ # Home child objects by id
+
+ def keyForObjectWithResourceID(self, homeResourceID, resourceID):
+ return "objectWithName:%s:%s" % (homeResourceID, resourceID)
+
+
</ins><span class="cx"> # Home metadata (Created/Modified)
</span><span class="cx">
</span><span class="cx"> def keyForHomeMetaData(self, homeResourceID):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/file.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def hasCalendarResourceUIDSomewhereElse(self, uid, ok_object, type):
</span><span class="cx">
</span><del>- objectResources = (yield self.objectResourcesWithUID(uid, ("inbox",)))
</del><ins>+ objectResources = (yield self.getCalendarResourcesForUID(uid))
</ins><span class="cx"> for objectResource in objectResources:
</span><span class="cx"> if ok_object and objectResource._path == ok_object._path:
</span><span class="cx"> continue
</span><span class="lines">@@ -140,14 +140,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def getCalendarResourcesForUID(self, uid, allow_shared=False):
</del><ins>+ def getCalendarResourcesForUID(self, uid):
</ins><span class="cx">
</span><del>- results = []
- objectResources = (yield self.objectResourcesWithUID(uid, ("inbox",)))
- for objectResource in objectResources:
- if allow_shared or objectResource._parentCollection.owned():
- results.append(objectResource)
-
</del><ins>+ results = (yield self.objectResourcesWithUID(uid, ("inbox",)))
</ins><span class="cx"> returnValue(results)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/schedule.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/schedule.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/txdav/caldav/datastore/schedule.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -112,8 +112,8 @@
</span><span class="cx"> return self._calendarHome.hasCalendarResourceUIDSomewhereElse(uid, ok_object, type)
</span><span class="cx">
</span><span class="cx">
</span><del>- def getCalendarResourcesForUID(self, uid, allow_shared=False):
- return self._calendarHome.getCalendarResourcesForUID(uid, allow_shared)
</del><ins>+ def getCalendarResourcesForUID(self, uid):
+ return self._calendarHome.getCalendarResourcesForUID(uid)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx"> STATUS_ORPHANED_CANCELLED_EVENT = 1
</span><span class="cx"> STATUS_ORPHANED_EVENT = 2
</span><span class="cx">
</span><del>- def __init__(self):
</del><ins>+ def __init__(self, logItems=None):
</ins><span class="cx">
</span><span class="cx"> self.return_status = ImplicitScheduler.STATUS_OK
</span><del>- self.logItems = {}
</del><ins>+ self.logItems = logItems
</ins><span class="cx"> self.allowed_to_schedule = True
</span><span class="cx"> self.suppress_refresh = False
</span><span class="cx">
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> if self.txn.doing_attendee_refresh == 0:
</span><span class="cx"> delattr(self.txn, "doing_attendee_refresh")
</span><span class="cx">
</span><del>- if refreshCount:
</del><ins>+ if refreshCount and self.logItems is not None:
</ins><span class="cx"> self.logItems["itip.refreshes"] = refreshCount
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -925,7 +925,8 @@
</span><span class="cx"> if self.action in ("create", "modify",):
</span><span class="cx"> total += (yield self.processRequests())
</span><span class="cx">
</span><del>- self.logItems["itip.requests"] = total
</del><ins>+ if self.logItems is not None:
+ self.logItems["itip.requests"] = total
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -1304,7 +1305,8 @@
</span><span class="cx"> # First make sure we are allowed to schedule
</span><span class="cx"> self.testSchedulingAllowed()
</span><span class="cx">
</span><del>- self.logItems["itip.reply"] = "reply"
</del><ins>+ if self.logItems is not None:
+ self.logItems["itip.reply"] = "reply"
</ins><span class="cx">
</span><span class="cx"> itipmsg = iTipGenerator.generateAttendeeReply(self.calendar, self.attendee, changedRids=changedRids)
</span><span class="cx">
</span><span class="lines">@@ -1317,7 +1319,8 @@
</span><span class="cx"> # First make sure we are allowed to schedule
</span><span class="cx"> self.testSchedulingAllowed()
</span><span class="cx">
</span><del>- self.logItems["itip.reply"] = "cancel"
</del><ins>+ if self.logItems is not None:
+ self.logItems["itip.reply"] = "cancel"
</ins><span class="cx">
</span><span class="cx"> itipmsg = iTipGenerator.generateAttendeeReply(self.calendar, self.attendee, force_decline=True)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingutilspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/utils.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/utils.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/utils.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>-def getCalendarObjectForRecord(txn, record, uid, allow_shared=False):
</del><ins>+def getCalendarObjectForRecord(txn, record, uid):
</ins><span class="cx"> """
</span><span class="cx"> Get a copy of the event for a calendar user identified by a directory record.
</span><span class="cx">
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> calendar_home = yield txn.calendarHomeWithUID(record.uid)
</span><span class="cx">
</span><span class="cx"> # Get matching newstore objects
</span><del>- objectResources = (yield calendar_home.getCalendarResourcesForUID(uid, allow_shared))
</del><ins>+ objectResources = (yield calendar_home.getCalendarResourcesForUID(uid))
</ins><span class="cx">
</span><span class="cx"> if len(objectResources) > 1:
</span><span class="cx"> # Delete all but the first one
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -527,9 +527,7 @@
</span><span class="cx"> # refer to calendar *object* UIDs, since calendar *resources* are an
</span><span class="cx"> # HTTP protocol layer thing, not a data store thing. (See also
</span><span class="cx"> # objectResourcesWithUID.)
</span><del>- objectResources = (
- yield self.objectResourcesWithUID(uid, ["inbox"], False)
- )
</del><ins>+ objectResources = (yield self.getCalendarResourcesForUID(uid))
</ins><span class="cx"> for objectResource in objectResources:
</span><span class="cx"> if ok_object and objectResource._resourceID == ok_object._resourceID:
</span><span class="cx"> continue
</span><span class="lines">@@ -541,15 +539,22 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def getCalendarResourcesForUID(self, uid, allow_shared=False):
</del><ins>+ def getCalendarResourcesForUID(self, uid):
+ """
+ Find all calendar object resources in the calendar home that are not in the "inbox" collection
+ and not in shared collections.
+ Cache the result of this query as it can happen multiple times during scheduling under slightly
+ different circumstances.
</ins><span class="cx">
</span><del>- results = []
- objectResources = (yield self.objectResourcesWithUID(uid, ["inbox"]))
- for objectResource in objectResources:
- if allow_shared or objectResource._parentCollection.owned():
- results.append(objectResource)
</del><ins>+ @param uid: the UID of the calendar object resources to find
+ @type uid: C{str}
+ """
</ins><span class="cx">
</span><del>- returnValue(results)
</del><ins>+ if not hasattr(self, "_cachedCalendarResourcesForUID"):
+ self._cachedCalendarResourcesForUID = {}
+ if uid not in self._cachedCalendarResourcesForUID:
+ self._cachedCalendarResourcesForUID[uid] = (yield self.objectResourcesWithUID(uid, ["inbox"], allowShared=False))
+ returnValue(self._cachedCalendarResourcesForUID[uid])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -1953,7 +1958,7 @@
</span><span class="cx"> user_uuid = self._parentCollection.viewerHome().uid()
</span><span class="cx"> component = PerUserDataFilter(user_uuid).filter(component.duplicate())
</span><span class="cx">
</span><del>- scheduler = ImplicitScheduler()
</del><ins>+ scheduler = ImplicitScheduler(logItems=self._txn.logItems)
</ins><span class="cx">
</span><span class="cx"> # PUT
</span><span class="cx"> do_implicit_action, is_scheduling_resource = (yield scheduler.testImplicitSchedulingPUT(
</span><span class="lines">@@ -2610,7 +2615,7 @@
</span><span class="cx"> if not isinbox and internal_state == ComponentRemoveState.NORMAL:
</span><span class="cx"> # Get data we need for implicit scheduling
</span><span class="cx"> calendar = (yield self.componentForUser())
</span><del>- scheduler = ImplicitScheduler()
</del><ins>+ scheduler = ImplicitScheduler(logItems=self._txn.logItems)
</ins><span class="cx"> do_implicit_action, _ignore = (yield scheduler.testImplicitSchedulingDELETE(
</span><span class="cx"> self.calendar(),
</span><span class="cx"> self,
</span><span class="lines">@@ -2929,7 +2934,7 @@
</span><span class="cx">
</span><span class="cx"> # Only allow organizers to manipulate managed attachments for now
</span><span class="cx"> calendar = (yield self.componentForUser())
</span><del>- scheduler = ImplicitScheduler()
</del><ins>+ scheduler = ImplicitScheduler(logItems=self._txn.logItems)
</ins><span class="cx"> is_attendee = (yield scheduler.testAttendeeEvent(self.calendar(), self, calendar,))
</span><span class="cx"> if is_attendee:
</span><span class="cx"> raise InvalidAttachmentOperation("Attendees are not allowed to manipulate managed attachments")
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -525,16 +525,25 @@
</span><span class="cx"> "different-name": self.sampleEvent("other-uid", "tgt other"),
</span><span class="cx"> },
</span><span class="cx"> )
</span><ins>+
</ins><span class="cx"> txn = self.transactionUnderTest()
</span><del>- c1 = yield txn.calendarHomeWithUID("conflict1")
</del><span class="cx"> c2 = yield txn.calendarHomeWithUID("conflict2")
</span><span class="cx"> otherCal = yield c2.createCalendarWithName("othercal")
</span><del>- otherCal.createCalendarObjectWithName(
</del><ins>+ yield otherCal.createCalendarObjectWithName(
</ins><span class="cx"> "some-name", Component.fromString(
</span><span class="cx"> self.sampleEvent("oc", "target calendar")[0]
</span><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ yield self.commit()
+
+ txn = self.transactionUnderTest()
+ c1 = yield txn.calendarHomeWithUID("conflict1")
+ c2 = yield txn.calendarHomeWithUID("conflict2")
</ins><span class="cx"> yield migrateHome(c1, c2, merge=True)
</span><ins>+ yield self.commit()
+
+ txn = self.transactionUnderTest()
+ c2 = yield txn.calendarHomeWithUID("conflict2")
</ins><span class="cx"> targetCal = yield c2.calendarWithName("conflicted")
</span><span class="cx"> yield self.checkSummary("same-name", "target", targetCal)
</span><span class="cx"> yield self.checkSummary("different-name", "tgt other", targetCal)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (11839 => 11840)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py        2013-10-28 23:58:22 UTC (rev 11839)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py        2013-10-29 00:05:11 UTC (rev 11840)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> from twext.enterprise.dal.syntax import (
</span><span class="cx"> Delete, utcNowSQL, Union, Insert, Len, Max, Parameter, SavepointAction,
</span><span class="cx"> Select, Update, ColumnSyntax, TableSyntax, Upper, Count, ALL_COLUMNS, Sum,
</span><del>- DatabaseLock, DatabaseUnlock )
</del><ins>+ DatabaseLock, DatabaseUnlock)
</ins><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><span class="cx"> from twext.enterprise.queue import LocalQueuer
</span><span class="cx"> from twext.enterprise.util import parseSQLTimestamp
</span><span class="lines">@@ -315,6 +315,7 @@
</span><span class="cx"> self.label = label
</span><span class="cx"> self.logFileName = logFileName
</span><span class="cx"> self.statements = []
</span><ins>+ self.startTime = time.time()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def startStatement(self, sql, args):
</span><span class="lines">@@ -330,7 +331,7 @@
</span><span class="cx"> """
</span><span class="cx"> args = ["%s" % (arg,) for arg in args]
</span><span class="cx"> args = [((arg[:10] + "...") if len(arg) > 40 else arg) for arg in args]
</span><del>- self.statements.append(["%s %s" % (sql, args,), 0, 0])
</del><ins>+ self.statements.append(["%s %s" % (sql, args,), 0, 0, 0])
</ins><span class="cx"> return len(self.statements) - 1, time.time()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -344,8 +345,10 @@
</span><span class="cx"> @type rows: C{int}
</span><span class="cx"> """
</span><span class="cx"> index, tstamp = context
</span><ins>+ t = time.time()
</ins><span class="cx"> self.statements[index][1] = len(rows) if rows else 0
</span><del>- self.statements[index][2] = time.time() - tstamp
</del><ins>+ self.statements[index][2] = t - tstamp
+ self.statements[index][3] = t
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def printReport(self):
</span><span class="lines">@@ -353,19 +356,28 @@
</span><span class="cx"> Print a report of all the SQL statements executed to date.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ total_statements = len(self.statements)
+ total_rows = sum([statement[1] for statement in self.statements])
+ total_time = sum([statement[2] for statement in self.statements]) * 1000.0
+
</ins><span class="cx"> toFile = StringIO()
</span><span class="cx"> toFile.write("*** SQL Stats ***\n")
</span><span class="cx"> toFile.write("\n")
</span><span class="cx"> toFile.write("Label: %s\n" % (self.label,))
</span><span class="cx"> toFile.write("Unique statements: %d\n" % (len(set([statement[0] for statement in self.statements]),),))
</span><del>- toFile.write("Total statements: %d\n" % (len(self.statements),))
- toFile.write("Total rows: %d\n" % (sum([statement[1] for statement in self.statements]),))
- toFile.write("Total time (ms): %.3f\n" % (sum([statement[2] for statement in self.statements]) * 1000.0,))
- for sql, rows, t in self.statements:
</del><ins>+ toFile.write("Total statements: %d\n" % (total_statements,))
+ toFile.write("Total rows: %d\n" % (total_rows,))
+ toFile.write("Total time (ms): %.3f\n" % (total_time,))
+ t_last_end = self.startTime
+ for sql, rows, t_taken, t_end in self.statements:
</ins><span class="cx"> toFile.write("\n")
</span><span class="cx"> toFile.write("SQL: %s\n" % (sql,))
</span><span class="cx"> toFile.write("Rows: %s\n" % (rows,))
</span><del>- toFile.write("Time (ms): %.3f\n" % (t * 1000.0,))
</del><ins>+ toFile.write("Time (ms): %.3f\n" % (t_taken * 1000.0,))
+ toFile.write("Idle (ms): %.3f\n" % ((t_end - t_taken - t_last_end) * 1000.0,))
+ toFile.write("Elapsed (ms): %.3f\n" % ((t_end - self.startTime) * 1000.0,))
+ t_last_end = t_end
+ toFile.write("Commit (ms): %.3f\n" % ((time.time() - t_last_end) * 1000.0,))
</ins><span class="cx"> toFile.write("***\n\n")
</span><span class="cx">
</span><span class="cx"> if self.logFileName:
</span><span class="lines">@@ -373,8 +385,10 @@
</span><span class="cx"> else:
</span><span class="cx"> log.error(toFile.getvalue())
</span><span class="cx">
</span><ins>+ return (total_statements, total_rows, total_time,)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CommonStoreTransactionMonitor(object):
</span><span class="cx"> """
</span><span class="cx"> Object that monitors the state of a transaction over time and logs or times out
</span><span class="lines">@@ -484,7 +498,9 @@
</span><span class="cx"> self.iudCount = 0
</span><span class="cx"> self.currentStatement = None
</span><span class="cx">
</span><ins>+ self.logItems = {}
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def enqueue(self, workItem, **kw):
</span><span class="cx"> """
</span><span class="cx"> Enqueue a L{twext.enterprise.queue.WorkItem} for later execution.
</span><span class="lines">@@ -1033,7 +1049,7 @@
</span><span class="cx">
</span><span class="cx"> # Do stats logging as a postCommit because there might be some pending preCommit SQL we want to log
</span><span class="cx"> if self._stats:
</span><del>- self.postCommit(self._stats.printReport)
</del><ins>+ self.postCommit(self.statsReport)
</ins><span class="cx"> return self._sqlTxn.commit()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1044,6 +1060,16 @@
</span><span class="cx"> return self._sqlTxn.abort()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def statsReport(self):
+ """
+ Print the stats report and record log items
+ """
+ sql_statements, sql_rows, sql_time = self._stats.printReport()
+ self.logItems["sql-s"] = str(sql_statements)
+ self.logItems["sql-r"] = str(sql_rows)
+ self.logItems["sql-t"] = "%.1f" % (sql_time,)
+
+
</ins><span class="cx"> def _oldEventsBase(self, limit):
</span><span class="cx"> ch = schema.CALENDAR_HOME
</span><span class="cx"> co = schema.CALENDAR_OBJECT
</span><span class="lines">@@ -2330,16 +2356,20 @@
</span><span class="cx"> raise NotImplementedError()
</span><span class="cx">
</span><span class="cx">
</span><del>- @classproperty
- def _objectNamesSinceRevisionQuery(cls): #@NoSelf
</del><ins>+ @classmethod
+ def _objectNamesSinceRevisionQuery(cls, deleted=True): #@NoSelf
</ins><span class="cx"> """
</span><span class="cx"> DAL query for (resource, deleted-flag)
</span><span class="cx"> """
</span><span class="cx"> rev = cls._revisionsSchema
</span><del>- return Select([rev.RESOURCE_NAME, rev.DELETED],
- From=rev,
- Where=(rev.REVISION > Parameter("revision")).And(
- rev.RESOURCE_ID == Parameter("resourceID")))
</del><ins>+ where = (rev.REVISION > Parameter("revision")).And(rev.RESOURCE_ID == Parameter("resourceID"))
+ if not deleted:
+ where = where.And(rev.DELETED == False)
+ return Select(
+ [rev.RESOURCE_NAME, rev.DELETED],
+ From=rev,
+ Where=where,
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def resourceNamesSinceToken(self, token):
</span><span class="lines">@@ -2364,10 +2394,10 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> results = [
</span><del>- (name if name else "", deleted)
- for name, deleted in
- (yield self._objectNamesSinceRevisionQuery.on(
- self._txn, revision=revision, resourceID=self._resourceID))
</del><ins>+ (name if name else "", deleted) for name, deleted in
+ (yield self._objectNamesSinceRevisionQuery(deleted=(revision != 0)).on(
+ self._txn, revision=revision, resourceID=self._resourceID)
+ )
</ins><span class="cx"> ]
</span><span class="cx"> results.sort(key=lambda x: x[1])
</span><span class="cx">
</span><span class="lines">@@ -3025,7 +3055,9 @@
</span><span class="cx"> queryCacher = self._txn._queryCacher
</span><span class="cx"> if queryCacher:
</span><span class="cx"> cacheKey = queryCacher.keyForObjectWithName(shareeView._home._resourceID, shareeView._name)
</span><del>- queryCacher.invalidateAfterCommit(self._txn, cacheKey)
</del><ins>+ yield queryCacher.invalidateAfterCommit(self._txn, cacheKey)
+ cacheKey = queryCacher.keyForObjectWithResourceID(shareeView._home._resourceID, shareeView._resourceID)
+ yield queryCacher.invalidateAfterCommit(self._txn, cacheKey)
</ins><span class="cx">
</span><span class="cx"> shareeView._name = sharedname[0][0]
</span><span class="cx">
</span><span class="lines">@@ -3083,7 +3115,9 @@
</span><span class="cx"> queryCacher = self._txn._queryCacher
</span><span class="cx"> if queryCacher:
</span><span class="cx"> cacheKey = queryCacher.keyForObjectWithName(shareeHome._resourceID, shareeChild._name)
</span><del>- queryCacher.invalidateAfterCommit(self._txn, cacheKey)
</del><ins>+ yield queryCacher.invalidateAfterCommit(self._txn, cacheKey)
+ cacheKey = queryCacher.keyForObjectWithResourceID(shareeHome._resourceID, shareeChild._resourceID)
+ yield queryCacher.invalidateAfterCommit(self._txn, cacheKey)
</ins><span class="cx"> else:
</span><span class="cx"> deletedBindName = None
</span><span class="cx">
</span><span class="lines">@@ -3348,10 +3382,9 @@
</span><span class="cx"> def invalidateQueryCache(self):
</span><span class="cx"> queryCacher = self._txn._queryCacher
</span><span class="cx"> if queryCacher is not None:
</span><del>- cacheKey = queryCacher.keyForHomeChildMetaData(self._resourceID)
- yield queryCacher.invalidateAfterCommit(self._txn, cacheKey)
- cacheKey = queryCacher.keyForObjectWithName(self._home._resourceID, self._name)
- yield queryCacher.invalidateAfterCommit(self._txn, cacheKey)
</del><ins>+ yield queryCacher.invalidateAfterCommit(self._txn, queryCacher.keyForHomeChildMetaData(self._resourceID))
+ yield queryCacher.invalidateAfterCommit(self._txn, queryCacher.keyForObjectWithName(self._home._resourceID, self._name))
+ yield queryCacher.invalidateAfterCommit(self._txn, queryCacher.keyForObjectWithResourceID(self._home._resourceID, self._resourceID))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -3528,6 +3561,7 @@
</span><span class="cx"> if rows and queryCacher:
</span><span class="cx"> # Cache the result
</span><span class="cx"> queryCacher.setAfterCommit(home._txn, cacheKey, rows)
</span><ins>+ queryCacher.setAfterCommit(home._txn, queryCacher.keyForObjectWithResourceID(home._resourceID, rows[0][2]), rows)
</ins><span class="cx">
</span><span class="cx"> if not rows:
</span><span class="cx"> returnValue(None)
</span><span class="lines">@@ -3568,8 +3602,24 @@
</span><span class="cx"> @return: an L{CommonHomeChild} or C{None} if no such child
</span><span class="cx"> exists.
</span><span class="cx"> """
</span><del>- rows = yield cls._bindForResourceIDAndHomeID.on(
- home._txn, resourceID=resourceID, homeID=home._resourceID)
</del><ins>+
+ rows = None
+ queryCacher = home._txn._queryCacher
+
+ if queryCacher:
+ # Retrieve data from cache
+ cacheKey = queryCacher.keyForObjectWithResourceID(home._resourceID, resourceID)
+ rows = yield queryCacher.get(cacheKey)
+
+ if rows is None:
+ # No cached copy
+ rows = yield cls._bindForResourceIDAndHomeID.on(home._txn, resourceID=resourceID, homeID=home._resourceID)
+
+ if rows and queryCacher:
+ # Cache the result (under both the ID and name values)
+ queryCacher.setAfterCommit(home._txn, cacheKey, rows)
+ queryCacher.setAfterCommit(home._txn, queryCacher.keyForObjectWithName(home._resourceID, rows[0][3]), rows)
+
</ins><span class="cx"> if not rows:
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="lines">@@ -3750,6 +3800,8 @@
</span><span class="cx"> if queryCacher:
</span><span class="cx"> cacheKey = queryCacher.keyForObjectWithName(self._home._resourceID, oldName)
</span><span class="cx"> yield queryCacher.invalidateAfterCommit(self._home._txn, cacheKey)
</span><ins>+ cacheKey = queryCacher.keyForObjectWithResourceID(self._home._resourceID, self._resourceID)
+ yield queryCacher.invalidateAfterCommit(self._home._txn, cacheKey)
</ins><span class="cx">
</span><span class="cx"> yield self._renameQuery.on(self._txn, name=name,
</span><span class="cx"> resourceID=self._resourceID,
</span><span class="lines">@@ -3783,6 +3835,8 @@
</span><span class="cx"> if queryCacher:
</span><span class="cx"> cacheKey = queryCacher.keyForObjectWithName(self._home._resourceID, self._name)
</span><span class="cx"> yield queryCacher.invalidateAfterCommit(self._home._txn, cacheKey)
</span><ins>+ cacheKey = queryCacher.keyForObjectWithResourceID(self._home._resourceID, self._resourceID)
+ yield queryCacher.invalidateAfterCommit(self._home._txn, cacheKey)
</ins><span class="cx">
</span><span class="cx"> yield self._deletedSyncToken()
</span><span class="cx"> yield self._deleteQuery.on(self._txn, NoSuchHomeChildError,
</span><span class="lines">@@ -4499,7 +4553,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def create(cls, parent, name, component, options=None):
</span><span class="cx">
</span><del>- child = (yield cls.objectWithName(parent, name, None))
</del><ins>+ child = (yield parent.objectResourceWithName(name))
</ins><span class="cx"> if child:
</span><span class="cx"> raise ObjectResourceNameAlreadyExistsError(name)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>