r4910 - trunk/test/stress-test

[daigle at ecoinformatics.org]

Author: daigle
Date: 2009-04-13 09:34:43 -0700 (Mon, 13 Apr 2009)
New Revision: 4910

Modified:
   trunk/test/stress-test/load-test-driver.sh
   trunk/test/stress-test/metacat.py
   trunk/test/stress-test/read-load-test.py
   trunk/test/stress-test/squery-load-test.py
Log:
Update load testing scripts

Modified: trunk/test/stress-test/load-test-driver.sh
===================================================================
--- trunk/test/stress-test/load-test-driver.sh	2009-04-13 16:34:06 UTC (rev 4909)
+++ trunk/test/stress-test/load-test-driver.sh	2009-04-13 16:34:43 UTC (rev 4910)
@@ -10,50 +10,51 @@
 # squery-load-test.py dictionary-letter iterations delay test-server 
 ######################
 
-##### run squeries #####
-#./squery-load-test.py m 50 2 dev.nceas.ucsb.edu 2>&1 &
+./squery-load-test.py m 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####"
-#./squery-load-test.py n 50 2 dev.nceas.ucsb.edu 2>&1 &
+./squery-load-test.py n 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####
-#./squery-load-test.py o 50 2 dev.nceas.ucsb.edu 2>&1 &
+./squery-load-test.py o 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####
-#./squery-load-test.py p 50 2 dev.nceas.ucsb.edu 2>&1 &
+./squery-load-test.py p 50 4 dev.nceas.ucsb.edu 2>&1 &
 
 ######################
 # insert-load-test.py dictionary-letter iterations delay test-server 
 ######################
 
-##### run squeries #####
-./insert-load-test.py a 50 2 dev.nceas.ucsb.edu 2>&1 &
+./insert-load-test.py a 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####"
-./insert-load-test.py b 50 2 dev.nceas.ucsb.edu 2>&1 &
+./insert-load-test.py b 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####
-./insert-load-test.py c 50 2 dev.nceas.ucsb.edu 2>&1 &
+./insert-load-test.py c 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####
-./insert-load-test.py d 50 2 dev.nceas.ucsb.edu 2>&1 &
+./insert-load-test.py d 50 4 dev.nceas.ucsb.edu 2>&1 &
 
 ######################
 # read-load-test.py prefix iterations delay test-server 
 ######################
 
-##### run squeries #####
-#./read-load-test.py a 300 3 dev.nceas.ucsb.edu 2>&1 &
+./read-load-test.py a 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####"
-#./read-load-test.py b 300 3 dev.nceas.ucsb.edu 2>&1 &
+./read-load-test.py b 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####
-#./read-load-test.py c 300 3 dev.nceas.ucsb.edu 2>&1 &
+./read-load-test.py c 50 4 dev.nceas.ucsb.edu 2>&1 &
 
-##### run squeries #####
-#./read-load-test.py d 300 3 dev.nceas.ucsb.edu 2>&1 &
+./read-load-test.py d 50 4 dev.nceas.ucsb.edu 2>&1 &
 
+######################
+# read-get-load-test.py prefix iterations delay test-server 
+######################
+
+./read-get-load-test.py a 50 4 dev.nceas.ucsb.edu 2>&1 &
+
+./read-get-load-test.py b 50 4 dev.nceas.ucsb.edu 2>&1 &
+
+./read-get-load-test.py c 50 4 dev.nceas.ucsb.edu 2>&1 &
+
+./read-get-load-test.py d 50 4 dev.nceas.ucsb.edu 2>&1 &
+
+sleep 4
 echo
 echo "Running the following load tests:"
 ps auxwww |grep load-test.py |grep -v grep

Modified: trunk/test/stress-test/metacat.py
===================================================================
--- trunk/test/stress-test/metacat.py	2009-04-13 16:34:06 UTC (rev 4909)
+++ trunk/test/stress-test/metacat.py	2009-04-13 16:34:43 UTC (rev 4910)
@@ -135,4 +135,33 @@
            content = ""
         conn.close()
         return content
+        
+    def getRequest(self, queryString):
+        conn = httplib.HTTPConnection( self.metacatServer )
+        #params = urllib.urlencode( postdata )
+        #headers = { "Content-type" : "application/x-www-form-urlencoded", 
+        #            "Accept"       : "*/*"}
 
+        # If we have an active session, set the cookie
+        #if self.sessionid is not None:
+        #    headers['Cookie'] = self.sessionid
+
+        conn.request( "GET", self.metacatUrlPath + queryString )
+        response = conn.getresponse()
+
+        # If metacat responds with a new session id,
+        # register it with the metacat client instance
+        #setcookie = response.getheader("set-cookie", None)
+        #if setcookie:
+        #    jsid = setcookie.split(';')[0]
+        #    if jsid[:11] == "JSESSIONID=":
+        #       self.sessionid = jsid
+            
+        if response.status == 200:
+           content = response.read()
+        else:
+           print " SERVER DID NOT RETURN 'OK'.... STATUS is " + str(response.status) 
+           content = ""
+        conn.close()
+        return content
+

Modified: trunk/test/stress-test/read-load-test.py
===================================================================
--- trunk/test/stress-test/read-load-test.py	2009-04-13 16:34:06 UTC (rev 4909)
+++ trunk/test/stress-test/read-load-test.py	2009-04-13 16:34:43 UTC (rev 4910)
@@ -83,7 +83,7 @@
 	debug("[%s] -- ERROR: %s" % (docid, response))
 t2 = time()
 
-for i in range(1,iterations):
+for i in range(0,iterations):
 	t1 = time()
 
 	debug("[%s] -- Processing Read" % (docid))

Modified: trunk/test/stress-test/squery-load-test.py
===================================================================
--- trunk/test/stress-test/squery-load-test.py	2009-04-13 16:34:06 UTC (rev 4909)
+++ trunk/test/stress-test/squery-load-test.py	2009-04-13 16:34:43 UTC (rev 4910)
@@ -71,7 +71,7 @@
 	if response.find("<resultset>") != -1:
 		debug("[%s] -- SUCCESS: elapsed time: %.5f seconds" % (word, t2-t1))
 	else:
-		debug("[%s] -- ERROR: " % (word), response)
+		debug("[%s] -- ERROR: %s " % (word, response))
 			
 	iter_count = iter_count + 1
 	debug2("iter_count: %d, iterations: %d" % (iter_count, iterations))