Revision: 6471 http://trac.macosforge.org/projects/calendarserver/changeset/6471 Author: exarkun@twistedmatrix.com Date: 2010-10-27 10:36:01 -0700 (Wed, 27 Oct 2010) Log Message: ----------- Make sure that these benchmarks use a sensible calendar name so request logs aren't misleading Previously several benchmarks would issue requests against `calendar-change-date-benchmark`. Modified Paths: -------------- CalendarServer/trunk/contrib/performance/_event_change.py CalendarServer/trunk/contrib/performance/event_add_attendee.py CalendarServer/trunk/contrib/performance/event_change_date.py CalendarServer/trunk/contrib/performance/event_change_summary.py CalendarServer/trunk/contrib/performance/event_delete_attendee.py Modified: CalendarServer/trunk/contrib/performance/_event_change.py =================================================================== --- CalendarServer/trunk/contrib/performance/_event_change.py 2010-10-27 16:21:58 UTC (rev 6470) +++ CalendarServer/trunk/contrib/performance/_event_change.py 2010-10-27 17:36:01 UTC (rev 6471) @@ -24,7 +24,7 @@ user = password = "user01" root = "/" principal = "/" - calendar = "event-change-%s-benchmark" % (fieldName,) + calendar = "event-%s-benchmark" % (fieldName,) authinfo = HTTPDigestAuthHandler() authinfo.add_password( Modified: CalendarServer/trunk/contrib/performance/event_add_attendee.py =================================================================== --- CalendarServer/trunk/contrib/performance/event_add_attendee.py 2010-10-27 16:21:58 UTC (rev 6470) +++ CalendarServer/trunk/contrib/performance/event_add_attendee.py 2010-10-27 17:36:01 UTC (rev 6471) @@ -17,5 +17,5 @@ return event[:created] + attendees + event[created:] return _event_change.measure( - host, port, dtrace, 0, samples, "date", addAttendees, - eventPerSample=True) + host, port, dtrace, 0, samples, "add-attendee", + addAttendees, eventPerSample=True) Modified: CalendarServer/trunk/contrib/performance/event_change_date.py =================================================================== --- CalendarServer/trunk/contrib/performance/event_change_date.py 2010-10-27 16:21:58 UTC (rev 6470) +++ CalendarServer/trunk/contrib/performance/event_change_date.py 2010-10-27 17:36:01 UTC (rev 6471) @@ -32,4 +32,5 @@ def measure(host, port, dtrace, attendeeCount, samples): return _event_change.measure( - host, port, dtrace, attendeeCount, samples, "date", replaceTimestamp) + host, port, dtrace, attendeeCount, samples, "change-date", + replaceTimestamp) Modified: CalendarServer/trunk/contrib/performance/event_change_summary.py =================================================================== --- CalendarServer/trunk/contrib/performance/event_change_summary.py 2010-10-27 16:21:58 UTC (rev 6470) +++ CalendarServer/trunk/contrib/performance/event_change_summary.py 2010-10-27 17:36:01 UTC (rev 6471) @@ -9,4 +9,5 @@ def measure(host, port, dtrace, attendeeCount, samples): return _event_change.measure( - host, port, dtrace, attendeeCount, samples, "summary", replaceSummary) + host, port, dtrace, attendeeCount, samples, "change-summary", + replaceSummary) Modified: CalendarServer/trunk/contrib/performance/event_delete_attendee.py =================================================================== --- CalendarServer/trunk/contrib/performance/event_delete_attendee.py 2010-10-27 16:21:58 UTC (rev 6470) +++ CalendarServer/trunk/contrib/performance/event_delete_attendee.py 2010-10-27 17:36:01 UTC (rev 6471) @@ -16,5 +16,5 @@ return event return _event_change.measure( - host, port, dtrace, attendeeCount, samples, "date", deleteAttendees, - eventPerSample=True) + host, port, dtrace, attendeeCount, samples, "delete-attendee", + deleteAttendees, eventPerSample=True)