You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/11/01 06:36:14 UTC
svn commit: r1195833 [2/2] - in /hbase/trunk: ./
src/main/java/org/apache/hadoop/hbase/regionserver/
src/main/java/org/apache/hadoop/hbase/regionserver/metrics/
src/test/java/org/apache/hadoop/hbase/
src/test/java/org/apache/hadoop/hbase/avro/ src/test...
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java?rev=1195833&r1=1195832&r2=1195833&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java Tue Nov 1 05:36:12 2011
@@ -41,7 +41,7 @@ public class TestIdLock {
private static final int NUM_IDS = 16;
private static final int NUM_THREADS = 128;
- private static final int NUM_SECONDS = 20;
+ private static final int NUM_SECONDS = 15;
private IdLock idLock = new IdLock();
@@ -63,7 +63,6 @@ public class TestIdLock {
while (System.currentTimeMillis() < endTime) {
long id = rand.nextInt(NUM_IDS);
- LOG.info(clientId + " is waiting for id " + id);
IdLock.Entry lockEntry = idLock.getLockEntry(id);
try {
int sleepMs = 1 + rand.nextInt(4);
@@ -75,10 +74,7 @@ public class TestIdLock {
}
idOwner.put(id, clientId);
- LOG.info(clientId + " took id " + id + ", sleeping for " +
- sleepMs + "ms");
Thread.sleep(sleepMs);
- LOG.info(clientId + " is releasing id " + id);
idOwner.remove(id);
} finally {
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java?rev=1195833&r1=1195832&r2=1195833&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java Tue Nov 1 05:36:12 2011
@@ -143,6 +143,7 @@ public class TestMergeTable {
LOG.info("Created region " + region.getRegionNameAsString());
for(int i = firstRow; i < firstRow + nrows; i++) {
Put put = new Put(Bytes.toBytes("row_" + String.format("%1$05d", i)));
+ put.setWriteToWAL(false);
put.add(COLUMN_NAME, null, VALUE);
region.put(put);
if (i % 10000 == 0) {
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java?rev=1195833&r1=1195832&r2=1195833&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java Tue Nov 1 05:36:12 2011
@@ -27,12 +27,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestCase;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
@@ -46,6 +41,7 @@ import org.apache.hadoop.util.ToolRunner
/** Test stand alone merge tool that can merge arbitrary regions */
public class TestMergeTool extends HBaseTestCase {
static final Log LOG = LogFactory.getLog(TestMergeTool.class);
+ HBaseTestingUtility TEST_UTIL;
// static final byte [] COLUMN_NAME = Bytes.toBytes("contents:");
static final byte [] FAMILY = Bytes.toBytes("contents");
static final byte [] QUALIFIER = Bytes.toBytes("dc");
@@ -123,7 +119,8 @@ public class TestMergeTool extends HBase
"row_1000", "row_1000", "row_1000", "row_1000" });
// Start up dfs
- this.dfsCluster = new MiniDFSCluster(conf, 2, true, (String[])null);
+ TEST_UTIL = new HBaseTestingUtility(conf);
+ this.dfsCluster = TEST_UTIL.startMiniDFSCluster(2);
this.fs = this.dfsCluster.getFileSystem();
System.out.println("fs=" + this.fs);
this.conf.set("fs.defaultFS", fs.getUri().toString());
@@ -162,7 +159,7 @@ public class TestMergeTool extends HBase
closeRootAndMeta();
} catch (Exception e) {
- shutdownDfs(dfsCluster);
+ TEST_UTIL.shutdownMiniCluster();
throw e;
}
}
@@ -170,7 +167,7 @@ public class TestMergeTool extends HBase
@Override
public void tearDown() throws Exception {
super.tearDown();
- shutdownDfs(dfsCluster);
+ TEST_UTIL.shutdownMiniCluster();
}
/*
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java?rev=1195833&r1=1195832&r2=1195833&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java Tue Nov 1 05:36:12 2011
@@ -287,6 +287,7 @@ public class TestRegionSplitter {
for(byte b=Byte.MIN_VALUE; b<Byte.MAX_VALUE; b++) {
byte[] whateverBytes = new byte[] {b};
Put p = new Put(whateverBytes);
+ p.setWriteToWAL(false);
p.add(CF_NAME.getBytes(), whateverBytes, whateverBytes);
hTable.put(p);
}