Author: jmhsieh
Date: Thu Feb 2 07:44:12 2012
New Revision: 1239473
URL: http://svn.apache.org/viewvc?rev=1239473&view=rev
Log:
HBASE-5212 Fix test TestTableMapReduce against 0.23 (Ted and Gregory)
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/pom.xml
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
Modified: hbase/branches/0.92/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1239473&r1=1239472&r2=1239473&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Thu Feb 2 07:44:12 2012
@@ -12,6 +12,7 @@ Release 0.92.1 - Unreleased
HBASE-5282 Possible file handle leak with truncated HLog file
HBASE-5307 Unable to gracefully decommission a node because of script error
(YiFeng Jiang)
+ HBASE-5212 Fix test TestTableMapReduce against 0.23 (Ted and Gregory)
TESTS
HBASE-5223 TestMetaReaderEditor is missing call to CatalogTracker.stop()
Modified: hbase/branches/0.92/pom.xml
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/pom.xml?rev=1239473&r1=1239472&r2=1239473&view=diff
==============================================================================
--- hbase/branches/0.92/pom.xml (original)
+++ hbase/branches/0.92/pom.xml Thu Feb 2 07:44:12 2012
@@ -1788,6 +1788,13 @@
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<version>${hadoop.version}</version>
<optional>true</optional>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop.version}</version>
+ <optional>true</optional>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1239473&r1=1239472&r2=1239473&view=diff
==============================================================================
---
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
(original)
+++
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
Thu Feb 2 07:44:12 2012
@@ -423,7 +423,7 @@ public class HLog implements Syncable {
if (os != null) {
try {
m = os.getWrappedStream().getClass().
- getMethod("getNumCurrentReplicas", new Class<?> []{});
+ getDeclaredMethod("getNumCurrentReplicas", new Class<?> []{});
m.setAccessible(true);
} catch (NoSuchMethodException e) {
// Thrown if getNumCurrentReplicas() function isn't available
@@ -438,7 +438,7 @@ public class HLog implements Syncable {
LOG.info("Using getNumCurrentReplicas--HDFS-826");
} else {
LOG.info("getNumCurrentReplicas--HDFS-826 not available; hdfs_out=" +
- os + ", exception=" + exception.getMessage());
+ os, exception);
}
return m;
}
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=1239473&r1=1239472&r2=1239473&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 Feb 2 07:44:12 2012
@@ -1164,6 +1164,8 @@ public class HBaseTestingUtility {
LOG.info("Mini mapreduce cluster started");
c.set("mapred.job.tracker",
mrCluster.createJobConf().get("mapred.job.tracker"));
+ /* this for mrv2 support */
+ conf.set("mapreduce.framework.name", "yarn");
}
/**
Modified:
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java?rev=1239473&r1=1239472&r2=1239473&view=diff
==============================================================================
---
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
(original)
+++
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
Thu Feb 2 07:44:12 2012
@@ -335,13 +335,18 @@ public class TestLogRolling {
// We start 3 servers and then stop 2 to avoid a directory naming conflict
// when we stop/start a namenode later, as mentioned in HBASE-5163
List<DataNode> existingNodes = dfsCluster.getDataNodes();
- dfsCluster
- .startDataNodes(TEST_UTIL.getConfiguration(), 3, true, null, null);
- for (DataNode dn: existingNodes){
- dfsCluster.stopDataNode( dn.dnRegistration.getName() );
+ int numDataNodes = 3;
+ dfsCluster.startDataNodes(TEST_UTIL.getConfiguration(), numDataNodes, true,
+ null, null);
+ List<DataNode> allNodes = dfsCluster.getDataNodes();
+ for (int i = allNodes.size()-1; i >= 0; i--) {
+ if (existingNodes.contains(allNodes.get(i))) {
+ dfsCluster.stopDataNode( i );
+ }
}
- assertTrue(
+ assertTrue("DataNodes " + dfsCluster.getDataNodes().size() +
+ " default replication " + fs.getDefaultReplication(),
dfsCluster.getDataNodes().size() >= fs.getDefaultReplication() + 1);
writeData(table, 2);
