1) Fix bug in perf test

2) Modify log level in delete method

Change-Id: I7fc1a00b389ed02068482cd4495a629d06c7c5f1

Author: mengli

src/main/com/schooner/MemCached/AscIIClient.java

@@ -184,21 +184,17 @@ public boolean delete(String key, Integer hashCode, Date expiry) {
 			// get result code
 			String line = new SockInputStream(sock, Integer.MAX_VALUE).getLine();
 			if (DELETED.equals(line)) { // successful
-				if (log.isInfoEnabled())
-					// log.info(new
-					// StringBuffer().append("++++ deletion of key: ").append(key)
-					// .append(" from cache was a success").toString());
-					return true;
+				if (log.isDebugEnabled())
+					log.debug(new StringBuffer().append("++++ deletion of key: ").append(key)
+							.append(" from cache was a success").toString());
+				return true;
 			} else if (NOTFOUND.equals(line)) { // key not found
-			// if (log.isInfoEnabled())
-			// log.info(new
-			// StringBuffer().append("++++ deletion of key: ").append(key)
-			// .append(" from cache failed as the key was not found").toString());
+				if (log.isDebugEnabled())
+					log.debug(new StringBuffer().append("++++ deletion of key: ").append(key)
+							.append(" from cache failed as the key was not found").toString());
 			} else { // other error information
-			// log.error(new
-			// StringBuffer().append("++++ error deleting key: ").append(key).toString());
-			// log.error(new
-			// StringBuffer().append("++++ server response: ").append(line).toString());
+				log.error(new StringBuffer().append("++++ error deleting key: ").append(key).toString());
+				log.error(new StringBuffer().append("++++ server response: ").append(line).toString());
 			}
 		} catch (IOException e) {
 

src/main/com/schooner/MemCached/SchoonerSockIOPool.java

@@ -150,7 +150,8 @@ protected final MessageDigest initialValue() {
 
 	boolean initialized = false;
 
-	private int initConn = 1;
+	private int minConn = 8;
+	private int maxConn = 32;
 	private long maxBusyTime = 1000 * 30; // max idle time for avail sockets
 	private long maintSleep = 1000 * 30; // maintenance thread sleep time
 	private int socketTO = 1000 * 30; // default timeout of socket reads
@@ -159,7 +160,7 @@ protected final MessageDigest initialValue() {
 	@SuppressWarnings("unused")
 	private static int recBufferSize = 128;// bufsize
 
-	private long maxIdle = 1000 * 60 * 5; // max idle time for avail sockets
+	private long maxIdle = 1000; // max idle time for avail sockets
 
 	private boolean aliveCheck = false; // default to not check each connection
 	// for being alive
@@ -193,8 +194,6 @@ protected final MessageDigest initialValue() {
 
 	ConcurrentMap<String, Long> hostDeadDur;
 
-	private int maxConn = 32;
-
 	private boolean isTcp;
 
 	private int bufferSize = 1024 * 1025;
@@ -311,7 +310,7 @@ private void populateBuckets() {
 			GenericObjectPool gop;
 			SchoonerSockIOFactory factory = new SchoonerSockIOFactory(servers[i], isTcp, bufferSize, socketTO,
 					socketConnectTO, nagle);
-			gop = new GenericObjectPool(factory, maxConn, GenericObjectPool.WHEN_EXHAUSTED_BLOCK, 1000, maxConn);
+			gop = new GenericObjectPool(factory, maxConn, GenericObjectPool.WHEN_EXHAUSTED_BLOCK, maxIdle, maxConn);
 			factory.setSockets(gop);
 			socketPool.put(servers[i], gop);
 		}
@@ -351,7 +350,7 @@ private void populateConsistentBuckets() {
 			GenericObjectPool gop;
 			SchoonerSockIOFactory factory = new SchoonerSockIOFactory(servers[i], isTcp, bufferSize, socketTO,
 					socketConnectTO, nagle);
-			gop = new GenericObjectPool(factory, maxConn, GenericObjectPool.WHEN_EXHAUSTED_BLOCK, 1000, maxConn);
+			gop = new GenericObjectPool(factory, maxConn, GenericObjectPool.WHEN_EXHAUSTED_BLOCK, maxIdle, maxConn);
 			factory.setSockets(gop);
 			socketPool.put(servers[i], gop);
 		}
@@ -558,6 +557,7 @@ protected final void closeSocketPool() {
 			try {
 				sockets.close();
 			} catch (Exception e) {
+				log.error("++++ failed to close socket pool.");
 			}
 		}
 	}
@@ -577,7 +577,6 @@ public void shutDown() {
 		buckets = null;
 		consistentBuckets = null;
 		initialized = false;
-
 	}
 
 	/**
@@ -637,7 +636,8 @@ public final Integer[] getWeights() {
 	 *            int number of connections
 	 */
 	public final void setInitConn(int initConn) {
-		this.initConn = initConn;
+		if (initConn < minConn)
+			minConn = initConn;
 	}
 
 	/**
@@ -647,7 +647,7 @@ public final void setInitConn(int initConn) {
 	 * @return number of connections
 	 */
 	public final int getInitConn() {
-		return this.initConn;
+		return this.minConn;
 	}
 
 	/**
@@ -994,11 +994,11 @@ public int getMaxConn() {
 	}
 
 	public void setMinConn(int minConn) {
-		this.initConn = minConn;
+		this.minConn = minConn;
 	}
 
 	public int getMinConn() {
-		return initConn;
+		return minConn;
 	}
 
 	public void setBufferSize(int bufferSize) {

src/test/com/schooner/MemCached/MemcachedPerfTest.java

@@ -48,18 +48,15 @@ public static void main(String[] args) {
 		// initialize the pool for memcache servers
 		SchoonerSockIOPool pool = SchoonerSockIOPool.getInstance("test");
 		pool.setServers(serverlist);
-
-		// pool.setInitConn(5);
-		// pool.setMinConn(5);
-		pool.setMaxConn(50);
-		// pool.setMaintSleep(30);
-
+		pool.setMaxConn(Integer.parseInt(args[5]));
+		pool.setMinConn(Integer.parseInt(args[4]));
+		pool.setMaxIdle(Integer.parseInt(args[6]));
 		pool.setNagle(false);
 		pool.initialize();
 
 		int threads = Integer.parseInt(args[1]);
 		int runs = Integer.parseInt(args[2]);
-		int size = 1024 * Integer.parseInt(args[3]); // how many kilobytes
+		int size = 1024 * Integer.parseInt(args[3]) / 4; // how many kilobytes
 
 		// get object to store
 		int[] obj = new int[size];