[CalendarServer-changes] [13184] CalendarServer/trunk/contrib/performance/loadtest

[source_changes at macosforge.org]

Revision: 13184
          http://trac.calendarserver.org//changeset/13184
Author:   dre at apple.com
Date:     2014-04-07 17:08:37 -0700 (Mon, 07 Apr 2014)
Log Message:
-----------
Fix client sim server stats by sending a json command instead of just reading; also adapt to changes in the data we get back

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/config.plist
    CalendarServer/trunk/contrib/performance/loadtest/sim.py

Modified: CalendarServer/trunk/contrib/performance/loadtest/config.plist
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/config.plist	2014-04-08 00:02:16 UTC (rev 13183)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.plist	2014-04-08 00:08:37 UTC (rev 13184)
@@ -41,7 +41,7 @@
 		<key>serverStats</key>
 		<dict>
 			<key>enabled</key>
-			<false/>
+			<true/>
 			<key>Port</key>
 			<integer>8100</integer>
 		</dict>

Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/sim.py	2014-04-08 00:02:16 UTC (rev 13183)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py	2014-04-08 00:08:37 UTC (rev 13184)
@@ -488,7 +488,7 @@
             _ignore_scheme, hostname, _ignore_path, _ignore_query, _ignore_fragment = urlsplit(self.serverStats["server"])
             data = self.readStatsSock((hostname.split(":")[0], self.serverStats["Port"],), True)
             if "Failed" not in data:
-                data = data["5 Minutes"]
+                data = data["stats"]["5m"]
                 result = (
                     safeDivision(float(data["requests"]), 5 * 60),
                     safeDivision(data["t"], data["requests"]),
@@ -511,8 +511,9 @@
         try:
             s = socket.socket(socket.AF_INET if useTCP else socket.AF_UNIX, socket.SOCK_STREAM)
             s.connect(sockname)
+            s.sendall('["stats"]' + "\r\n")
             data = ""
-            while True:
+            while not data.endswith("\n"):
                 d = s.recv(1024)
                 if d:
                     data += d
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140407/02205e09/attachment.html>