You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by to...@apache.org on 2011/10/14 00:50:03 UTC
svn commit: r1183153 - in /hbase/branches/0.92: ./
src/test/java/org/apache/hadoop/hbase/
src/test/java/org/apache/hadoop/hbase/coprocessor/
src/test/java/org/apache/hadoop/hbase/regionserver/wal/
Author: todd
Date: Thu Oct 13 22:50:03 2011
New Revision: 1183153
URL: http://svn.apache.org/viewvc?rev=1183153&view=rev
Log:
HBASE-4551 Fix pom and some test cases to compile and run against Hadoop 0.23
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/pom.xml
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1183153&r1=1183152&r2=1183153&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Thu Oct 13 22:50:03 2011
@@ -338,6 +338,8 @@ Release 0.92.0 - Unreleased
HBASE-4078 Validate store files after flush/compaction
HBASE-3417 CacheOnWrite is using the temporary output path for block names,
need to use a more consistent block naming scheme (jgray)
+ HBASE-4551 Fix pom and some test cases to compile and run against
+ Hadoop 0.23 (todd)
TESTS
HBASE-4492 TestRollingRestart fails intermittently
Modified: hbase/branches/0.92/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/pom.xml?rev=1183153&r1=1183152&r2=1183153&view=diff
==============================================================================
--- hbase/branches/0.92/pom.xml (original)
+++ hbase/branches/0.92/pom.xml Thu Oct 13 22:50:03 2011
@@ -1509,14 +1509,16 @@
<!-- test deps for hadoop-0.23 profile -->
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common-test</artifactId>
+ <artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-test</artifactId>
+ <artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1183153&r1=1183152&r2=1183153&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Thu Oct 13 22:50:03 2011
@@ -1434,35 +1434,6 @@ public class HBaseTestingUtility {
}
/**
- * Set soft and hard limits in namenode.
- * You'll get a NPE if you call before you've started a minidfscluster.
- * @param soft Soft limit
- * @param hard Hard limit
- * @throws NoSuchFieldException
- * @throws SecurityException
- * @throws IllegalAccessException
- * @throws IllegalArgumentException
- */
- public void setNameNodeNameSystemLeasePeriod(final int soft, final int hard)
- throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
- // TODO: If 0.20 hadoop do one thing, if 0.21 hadoop do another.
- // Not available in 0.20 hdfs. Use reflection to make it happen.
-
- // private NameNode nameNode;
- Field field = this.dfsCluster.getClass().getDeclaredField("nameNode");
- field.setAccessible(true);
- NameNode nn = (NameNode)field.get(this.dfsCluster);
- field = nn.getClass().getDeclaredField("namesystem");
- field.setAccessible(true);
- FSNamesystem namesystem = (FSNamesystem)field.get(nn);
-
- field = namesystem.getClass().getDeclaredField("leaseManager");
- field.setAccessible(true);
- LeaseManager lm = (LeaseManager)field.get(namesystem);
- lm.setLeasePeriod(100, 50000);
- }
-
- /**
* Set maxRecoveryErrorCount in DFSClient. In 0.20 pre-append its hard-coded to 5 and
* makes tests linger. Here is the exception you'll see:
* <pre>
Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java?rev=1183153&r1=1183152&r2=1183153&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java Thu Oct 13 22:50:03 2011
@@ -100,7 +100,6 @@ public class TestWALObserver {
conf.setInt("dfs.client.block.recovery.retries", 2);
TEST_UTIL.startMiniCluster(1);
- TEST_UTIL.setNameNodeNameSystemLeasePeriod(100, 10000);
Path hbaseRootDir =
TEST_UTIL.getDFSCluster().getFileSystem().makeQualified(new Path("/hbase"));
LOG.info("hbase.rootdir=" + hbaseRootDir);
Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=1183153&r1=1183152&r2=1183153&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java Thu Oct 13 22:50:03 2011
@@ -46,8 +46,9 @@ import org.apache.hadoop.hbase.Coprocess
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.coprocessor.SampleRegionWALObserver;
import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
import org.apache.hadoop.hdfs.server.datanode.DataNode;
import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
@@ -358,7 +359,8 @@ public class TestHLog {
// Stop the cluster. (ensure restart since we're sharing MiniDFSCluster)
try {
- cluster.getNameNode().setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+ DistributedFileSystem dfs = (DistributedFileSystem) cluster.getFileSystem();
+ dfs.setSafeMode(FSConstants.SafeModeAction.SAFEMODE_ENTER);
cluster.shutdown();
try {
// wal.writer.close() will throw an exception,
Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java?rev=1183153&r1=1183152&r2=1183153&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java Thu Oct 13 22:50:03 2011
@@ -140,8 +140,6 @@ public class TestHLogSplit {
regions = new ArrayList<String>();
Collections.addAll(regions, "bbb", "ccc");
InstrumentedSequenceFileLogWriter.activateFailure = false;
- // Set the soft lease for hdfs to be down from default of 5 minutes or so.
- TEST_UTIL.setNameNodeNameSystemLeasePeriod(100, 50000);
}
@After
Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java?rev=1183153&r1=1183152&r2=1183153&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java Thu Oct 13 22:50:03 2011
@@ -79,7 +79,6 @@ public class TestWALReplay {
// The below config supported by 0.20-append and CDH3b2
conf.setInt("dfs.client.block.recovery.retries", 2);
TEST_UTIL.startMiniDFSCluster(3);
- TEST_UTIL.setNameNodeNameSystemLeasePeriod(100, 10000);
Path hbaseRootDir =
TEST_UTIL.getDFSCluster().getFileSystem().makeQualified(new Path("/hbase"));
LOG.info("hbase.rootdir=" + hbaseRootDir);