You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/04/22 19:43:48 UTC
svn commit: r1470632 -
/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
Author: ecn
Date: Mon Apr 22 17:43:48 2013
New Revision: 1470632
URL: http://svn.apache.org/r1470632
Log:
ACCUMULO-1044 fix functional test to handle new constraint
Modified:
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java?rev=1470632&r1=1470631&r2=1470632&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java Mon Apr 22 17:43:48 2013
@@ -51,8 +51,10 @@ import org.apache.accumulo.server.securi
import org.apache.accumulo.server.tabletserver.TabletServer;
import org.apache.accumulo.server.tabletserver.TabletTime;
import org.apache.accumulo.server.util.MetadataTable;
+import org.apache.accumulo.server.zookeeper.TransactionWatcher;
import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
import org.apache.hadoop.io.Text;
public class SplitRecoveryTest extends FunctionalTest {
@@ -140,8 +142,9 @@ public class SplitRecoveryTest extends F
if (i == extentToSplit) {
splitMapFiles = mapFiles;
}
-
- MetadataTable.updateTabletDataFile(0, extent, mapFiles, "L0", SecurityConstants.getSystemCredentials(), zl);
+ int tid = 0;
+ TransactionWatcher.ZooArbitrator.start(Constants.BULK_ARBITRATOR_TYPE, tid);
+ MetadataTable.updateTabletDataFile(tid, extent, mapFiles, "L0", SecurityConstants.getSystemCredentials(), zl);
}
KeyExtent extent = extents[extentToSplit];