Author: stack
Date: Thu Oct 14 04:11:55 2010
New Revision: 1022372
URL: http://svn.apache.org/viewvc?rev=1022372&view=rev
Log:
HBASE-3110 TestReplicationSink failing in TRUNK up on Hudson; trying to see if
this fixes this test
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java?rev=1022372&r1=1022371&r2=1022372&view=diff
==============================================================================
---
hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
(original)
+++
hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
Thu Oct 14 04:11:55 2010
@@ -19,10 +19,14 @@
*/
package org.apache.hadoop.hbase.replication.regionserver;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
@@ -39,25 +43,13 @@ import org.apache.hadoop.hbase.util.Byte
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
public class TestReplicationSink {
-
- private static final Log LOG =
- LogFactory.getLog(TestReplicationSink.class);
-
+ private static final Log LOG = LogFactory.getLog(TestReplicationSink.class);
private static final int BATCH_SIZE = 10;
-
private static final long SLEEP_TIME = 500;
- private final static Configuration conf = HBaseConfiguration.create();
-
private final static HBaseTestingUtility TEST_UTIL =
new HBaseTestingUtility();
@@ -96,11 +88,10 @@ public class TestReplicationSink {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setBoolean("dfs.support.append", true);
- TEST_UTIL.getConfiguration().setBoolean(
- HConstants.REPLICATION_ENABLE_KEY, true);
+ TEST_UTIL.getConfiguration().setBoolean(HConstants.REPLICATION_ENABLE_KEY,
true);
TEST_UTIL.startMiniCluster(3);
- conf.setBoolean("dfs.support.append", true);
- SINK = new ReplicationSink(conf, STOPPABLE);
+ SINK =
+ new ReplicationSink(new Configuration(TEST_UTIL.getConfiguration()),
STOPPABLE);
table1 = TEST_UTIL.createTable(TABLE_NAME1, FAM_NAME1);
table2 = TEST_UTIL.createTable(TABLE_NAME2, FAM_NAME2);
}
@@ -260,4 +251,4 @@ public class TestReplicationSink {
return new HLog.Entry(key, edit);
}
-}
+}
\ No newline at end of file