svn commit: r1424060 - in /accumulo/trunk: fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java test/system/auto/TestUtils.py

[ec...@apache.org]

Author: ecn
Date: Wed Dec 19 19:57:20 2012
New Revision: 1424060

URL: http://svn.apache.org/viewvc?rev=1424060&view=rev
Log:
ACCUMULO-408 get the bulk functional tests working

Modified:
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
    accumulo/trunk/test/system/auto/TestUtils.py

Modified: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java?rev=1424060&r1=1424059&r2=1424060&view=diff
==============================================================================
--- accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java (original)
+++ accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java Wed Dec 19 19:57:20 2012
@@ -18,6 +18,7 @@ package org.apache.accumulo.fate.zookeep
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.Watcher;
@@ -76,12 +77,12 @@ public class ZooReader implements IZooRe
   
   @Override
   public void sync(final String path) throws KeeperException, InterruptedException {
-    final int[] rc = { 0 };
+    final AtomicInteger rc = new AtomicInteger();
     final AtomicBoolean waiter = new AtomicBoolean(false);
     getZooKeeper().sync(path, new VoidCallback() {
       @Override
       public void processResult(int code, String arg1, Object arg2) {
-        rc[0] = code;
+        rc.set(code);
         synchronized (waiter) {
           waiter.set(true);
           waiter.notifyAll();
@@ -91,12 +92,11 @@ public class ZooReader implements IZooRe
       while (!waiter.get())
         waiter.wait();
     }
-    Code code = Code.get(rc[0]);
+    Code code = Code.get(rc.get());
     if (code != KeeperException.Code.OK) {
       throw KeeperException.create(code);
     }
-  }
-  
+  }  
   
   public ZooReader(String keepers, int timeout) {
     this.keepers = keepers;

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java?rev=1424060&r1=1424059&r2=1424060&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java Wed Dec 19 19:57:20 2012
@@ -63,7 +63,7 @@ public class BulkSplitOptimizationTest e
     FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
     fs.delete(new Path("/tmp/testmf"), true);
     
-    CreateRFiles.main(new String[] {"tmp/testmf", "8", "0", "100000", "99"});
+    CreateRFiles.main(new String[] { "--output", "tmp/testmf", "--numThreads", "8", "--start", "0", "--end", "100000", "--splits", "99"});
     
     bulkImport(fs, TABLE_NAME, "/tmp/testmf");
     
@@ -82,7 +82,7 @@ public class BulkSplitOptimizationTest e
     
     checkSplits(TABLE_NAME, 50, 100);
     
-    VerifyIngest.main(new String[] {"-timestamp", "1", "-size", "50", "-random", "56", "100000", "0", "1"});
+    VerifyIngest.main(new String[] {"--timestamp", "1", "--size", "50", "--random", "56", "--rows", "100000", "--start", "0", "--cols", "1"});
     
     // ensure each tablet does not have all map files
     checkRFiles(TABLE_NAME, 50, 100, 1, 4);

Modified: accumulo/trunk/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/TestUtils.py?rev=1424060&r1=1424059&r2=1424060&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/TestUtils.py (original)
+++ accumulo/trunk/test/system/auto/TestUtils.py Wed Dec 19 19:57:20 2012
@@ -52,6 +52,7 @@ General_CLASSPATH = """
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
     $ACCUMULO_HOME/examples/instamo/target/classes,
     $ACCUMULO_HOME/examples/simple/target/classes,
     $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,