Browse Source

ZOOKEEPER-657. Cut down the running time of ZKDatabase corruption (Michi Mutsuzaki via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1594755 13f79535-47bb-0310-9956-ffa450edef68
Rakesh Radhakrishnan 11 years ago
parent
commit
74d8363cd5
2 changed files with 15 additions and 2 deletions
  1. 3 0
      CHANGES.txt
  2. 12 2
      src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java

+ 3 - 0
CHANGES.txt

@@ -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 - 

+ 12 - 2
src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java

@@ -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 extends ZKTestCase {
         }
     }
 
+    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 extends ZKTestCase {
             }});
         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 extends ZKTestCase {
         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();