You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ra...@apache.org on 2014/05/15 03:35:33 UTC

svn commit: r1594755 - in /zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java

Author: rakeshr
Date: Thu May 15 01:35:33 2014
New Revision: 1594755

URL: http://svn.apache.org/r1594755
Log:
ZOOKEEPER-657. Cut down the running time of ZKDatabase corruption (Michi Mutsuzaki via rakeshr)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1594755&r1=1594754&r2=1594755&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu May 15 01:35:33 2014
@@ -891,6 +891,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for
   source and text files (Raja Aluri via michim)
 
+  ZOOKEEPER-657. Cut down the running time of ZKDatabase corruption
+  (Michi Mutsuzaki via rakeshr)
+
 headers
 
 Release 3.4.0 - 

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java?rev=1594755&r1=1594754&r2=1594755&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java Thu May 15 01:35:33 2014
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.Arrays;
 
+import org.apache.zookeeper.AsyncCallback;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
@@ -72,6 +73,13 @@ public class ZkDatabaseCorruptionTest ex
         }
     }
 
+    private class NoopStringCallback implements AsyncCallback.StringCallback {
+        @Override
+        public void processResult(int rc, String path, Object ctx,
+                                  String name) {
+        }
+    }
+
     @Test
     public void testCorruption() throws Exception {
         ClientBase.waitForServerUp(qb.hostPort, 10000);
@@ -81,7 +89,8 @@ public class ZkDatabaseCorruptionTest ex
             }});
         SyncRequestProcessor.setSnapCount(100);
         for (int i = 0; i < 2000; i++) {
-            zk.create("/0-" + i, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+            zk.create("/0-" + i, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE,
+                      CreateMode.PERSISTENT, new NoopStringCallback(), null);
         }
         zk.close();
 
@@ -136,7 +145,8 @@ public class ZkDatabaseCorruptionTest ex
         zk = qb.createClient();
         SyncRequestProcessor.setSnapCount(100);
         for (int i = 2000; i < 4000; i++) {
-            zk.create("/0-" + i, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+            zk.create("/0-" + i, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE,
+                      CreateMode.PERSISTENT, new NoopStringCallback(), null);
         }
         zk.close();