perfsonar development work

Author: trzaszcz
Date: 2009-12-17 09:03:13 -0500 (Thu, 17 Dec 2009)
New Revision: 5425

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/Main.py
Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/auxiliary/TestService.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/DeregistrationTest.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/Main.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/ReregistrationThread.py
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
Log:
refactoring, multiThreading test engine improved

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/auxiliary/TestService.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/auxiliary/TestService.py
     2009-12-17 11:07:38 UTC (rev 5424)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/auxiliary/TestService.py
     2009-12-17 14:03:13 UTC (rev 5425)
@@ -12,7 +12,6 @@
     classdocs
     '''
 
-
     def __init__(self,host,url,resultFile):
         '''
         Constructor
@@ -20,10 +19,11 @@
         self.host=host
         self.url=url
         self.resultFile=resultFile
+        self.avg=0
         
         
     def runTest(self,messagesList):
-        sender=Sender("127.0.0.1:8080")
+        sender=Sender(self.host)
         sender.connect()
         strResult="";
         sum=0;
@@ -42,10 +42,14 @@
         for t in range(0,len(result_list)) :
             sum=sum+result_list[t]
             strResult=strResult+'%(iteration)d;%(time)f \n' % 
{"iteration":t+1,"time":result_list[t]}
-        strResult=strResult+'AVG;%(time)f \n' % 
{"time":(sum/len(result_list))}
         
-        f=open(self.resultFile,"w")
-        f.write(strResult)
+        self.avg=(sum/len(result_list))
+        strResult=strResult+'AVG;%(time)f \n' % {"time":self.avg}
+        
+        if self.resultFile is not None :
+            f=open(self.resultFile,"w")
+            f.write(strResult)
+        
         print "END"
         return strResult
         

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/DeregistrationTest.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/DeregistrationTest.py
        2009-12-17 11:07:38 UTC (rev 5424)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/DeregistrationTest.py
        2009-12-17 14:03:13 UTC (rev 5425)
@@ -20,7 +20,7 @@
         
message=soap_template_content.replace("ACCESS_POINT","http://localhost:8180/"+str(c)+"")
         messages.append(message)
     
-    testService=TestService("127.0.0.1:8080", 
"/geant2-java-xml-ls/services/LookupService", 
"../../../../../results/dr-ls2.txt")
+    testService=TestService("127.0.0.1:8080", 
"/perfsonar-java-xml-ls/services/LookupService", 
"../../../../../results/dr-ls2.txt")
     strResult=testService.runTest(messages)
     
     print "--------------------------"

Added: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/Main.py

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/Main.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/Main.py
  2009-12-17 11:07:38 UTC (rev 5424)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/Main.py
  2009-12-17 14:03:13 UTC (rev 5425)
@@ -4,6 +4,7 @@
 @author: czacha
 '''
 from pl.psnc.trzaszczka.multiThreadingTests.RegistrationThread import 
RegistrationThread
+from pl.psnc.trzaszczka.multiThreadingTests.ReregistrationThread import 
ReregistrationThread
 from pl.psnc.trzaszczka.multiThreadingTests.QueryThread import QueryThread
 from pl.psnc.trzaszczka.multiThreadingTests.DeregistrationThread import 
DeregistrationThread
 import time
@@ -26,12 +27,14 @@
     
     regThread1=RegistrationThread("Registration I", startTime, 0, endTime, 
1, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
     regThread2=RegistrationThread("Registration II", startTime, 30, endTime, 
2, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
+    reregThread=ReregistrationThread("Reregistration", startTime, 15, 
endTime, 1.5, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
     deregThread=DeregistrationThread("Deregistration I", startTime, 40, 
endTime, 0.5, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
     queryThread1=QueryThread("Query I", startTime, 5, endTime, 0.05, host, 
url_path, "../../../../../inputs/LSQueryRequest.xml",resultDir, r_list, 
f_list)
     queryThread2=QueryThread("Query II", startTime, 10, endTime, 0.05, host, 
url_path, "../../../../../inputs/LSQueryRequest.xml",resultDir, r_list, 
f_list)
     
     regThread1.start()
     regThread2.start()
+    reregThread.start()
     deregThread.start()
     queryThread1.start()
     queryThread2.start()

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/ReregistrationThread.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/ReregistrationThread.py
  2009-12-17 11:07:38 UTC (rev 5424)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/ReregistrationThread.py
  2009-12-17 14:03:13 UTC (rev 5425)
@@ -7,7 +7,7 @@
 from pl.psnc.trzaszczka.auxiliary.XMLGenerator import XMLGenerator
 
 
-class RegistrationThread(TestThread):
+class ReregistrationThread(TestThread):
     '''
     classdocs
     '''

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
        2009-12-17 11:07:38 UTC (rev 5424)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
        2009-12-17 14:03:13 UTC (rev 5425)
@@ -199,7 +199,7 @@
         * @return
         * @throws PerfSONARException
         */
-       public XMLDBResult performXQuery(String xquery) throws 
PerfSONARException {
+       public synchronized XMLDBResult performXQuery(String xquery) throws 
PerfSONARException {
                XPathQueryService service = getService();
                try {
 
@@ -232,6 +232,10 @@
                                                existResult.getBytes()), 
count);
                        }
                } catch (XMLDBException e) {
+                       
System.out.println("------------------------------------");
+                       System.out.println(xquery);
+                       
System.out.println("------------------------------------");
+                       e.printStackTrace();
                        throw new PerfSONARException("error/ls/query",
                                        "Problem with executing xquery :" + 
e.getMessage());
                } catch (IOException e) {

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
   2009-12-17 11:07:38 UTC (rev 5424)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
   2009-12-17 14:03:13 UTC (rev 5425)
@@ -93,10 +93,8 @@
                //TODO: improve this query 
                String xquery = XQUERY_DECLARE_NAMESPACES + " for $i in  " + 
"("
                                + 
"/nmwg:store[@type='"
 + LS_STORE_CONTROL_COLLECTION_TYPE
-                               + 
"']/nmwg:metadata[@id='"
 + metadataId + "']" + ", "
-                               + 
"/nmwg:store[@type='"
 + LS_STORE_COLLECTION_TYPE
                                + 
"']/nmwg:metadata[@id='"
 + metadataId + "']" + ")"
-                               + " return (update delete $i, 'removed') ";
+                               + " return (update delete $i, 'r') ";
 
                XMLDBResult res = performXQuery(xquery);
                result = res.getTotal();