incubator-olio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r763486 - in /incubator/olio/workload: php/trunk/lib/ php/trunk/src/org/apache/olio/workload/harness/ php/trunk/src/org/apache/olio/workload/util/ rails/trunk/lib/ rails/trunk/src/org/apache/olio/workload/harness/ rails/trunk/src/org/apache...
Date Thu, 09 Apr 2009 01:14:03 GMT
Author: shanti
Date: Thu Apr  9 01:14:02 2009
New Revision: 763486

URL: http://svn.apache.org/viewvc?rev=763486&view=rev
Log:
Fix for OLIO-70. Also replacing memcached jar with latest which has BSD license. 
Adding commons httpclient2.0.1 jar as the default one in faban is 3.0.

Added:
    incubator/olio/workload/php/trunk/lib/commons-httpclient-2.0.1.jar   (with props)
    incubator/olio/workload/php/trunk/lib/java_memcached-release_2.0.1.jar   (with props)
    incubator/olio/workload/rails/trunk/lib/commons-httpclient-2.0.1.jar   (with props)
    incubator/olio/workload/rails/trunk/lib/java_memcached-release_2.0.1.jar   (with props)
Removed:
    incubator/olio/workload/rails/trunk/lib/java_memcached-release_1.5.1.jar
Modified:
    incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
    incubator/olio/workload/php/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
    incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
    incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java

Added: incubator/olio/workload/php/trunk/lib/commons-httpclient-2.0.1.jar
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/lib/commons-httpclient-2.0.1.jar?rev=763486&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/olio/workload/php/trunk/lib/commons-httpclient-2.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/olio/workload/php/trunk/lib/java_memcached-release_2.0.1.jar
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/lib/java_memcached-release_2.0.1.jar?rev=763486&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/olio/workload/php/trunk/lib/java_memcached-release_2.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java?rev=763486&r1=763485&r2=763486&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
(original)
+++ incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
Thu Apr  9 01:14:02 2009
@@ -166,14 +166,14 @@
             dbHandle.waitFor();
 			int exitValue = dbHandle.exitValue();
 			if (exitValue != 0)
-				logger.severe("DB load error, exited with value " + exitValue);
+				throw (new Exception("DB load error, exited with value " + exitValue));
 		}
         
         if (mediaHandle != null) {
             mediaHandle.waitFor();
 			int exitValue = mediaHandle.exitValue();
 			if (exitValue != 0)
-				logger.severe("File load error, exited with value " + exitValue);
+				throw (new Exception("File load error, exited with value " + exitValue));
 		}
         
         //start the memcache servers

Modified: incubator/olio/workload/php/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java?rev=763486&r1=763485&r2=763486&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
(original)
+++ incubator/olio/workload/php/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
Thu Apr  9 01:14:02 2009
@@ -66,7 +66,7 @@
             pool.initialize();
 
             cache = new MemCachedClient();
-            cache.setPoolName("livePool");
+            //cache.setPoolName("livePool");
         }               
     }
 
@@ -82,7 +82,7 @@
             pool.initialize();
 
             cache = new MemCachedClient();
-            cache.setPoolName("livePool");
+            //cache.setPoolName("livePool");
         }
     }
 

Added: incubator/olio/workload/rails/trunk/lib/commons-httpclient-2.0.1.jar
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/lib/commons-httpclient-2.0.1.jar?rev=763486&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/olio/workload/rails/trunk/lib/commons-httpclient-2.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/olio/workload/rails/trunk/lib/java_memcached-release_2.0.1.jar
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/lib/java_memcached-release_2.0.1.jar?rev=763486&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/olio/workload/rails/trunk/lib/java_memcached-release_2.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java?rev=763486&r1=763485&r2=763486&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
(original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
Thu Apr  9 01:14:02 2009
@@ -164,14 +164,14 @@
             dbHandle.waitFor();
 			int exitValue = dbHandle.exitValue();
 			if (exitValue != 0)
-			   logger.severe("DB load error, exited with value " + exitValue);
+			   throw(new Exception("DB load error, exited with value " + exitValue));
 		}
         
         if (mediaHandle != null) {
             mediaHandle.waitFor();
 			int exitValue = mediaHandle.exitValue();
 			if (exitValue != 0)
-			   logger.severe("File load error, exited with value " + exitValue);
+			   throw (new Exception("File load error, exited with value " + exitValue));
 		}
 
         //start the memcache servers

Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java?rev=763486&r1=763485&r2=763486&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
(original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
Thu Apr  9 01:14:02 2009
@@ -70,7 +70,7 @@
             pool.initialize();
 
             cache = new MemCachedClient();
-            cache.setPoolName("livePool");
+            //cache.setPoolName("livePool");
         }               
     }
 
@@ -86,7 +86,7 @@
             pool.initialize();
 
             cache = new MemCachedClient();
-            cache.setPoolName("livePool");
+            //cache.setPoolName("livePool");
         }
     }
 



Mime
View raw message