You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by li...@apache.org on 2014/04/17 02:49:22 UTC
svn commit: r1588119 - in /hbase/branches/0.89-fb: ./
src/main/java/org/apache/hadoop/hbase/regionserver/
src/main/java/org/apache/hadoop/hbase/util/
src/test/java/org/apache/hadoop/hbase/
src/test/java/org/apache/hadoop/hbase/regionserver/ src/test/ja...
Author: liyin
Date: Thu Apr 17 00:49:21 2014
New Revision: 1588119
URL: http://svn.apache.org/r1588119
Log:
[HBASE-9930] Fix new HDFS dependencies
Author: manukranthk
Summary: On pulling the new HDFS dependencies, the trunk cannot be built. This diff is to fix it.
Test Plan: mvn -Dskiptests package
Reviewers: daviddeng, pritam, dikang, weiyan, hkuang, tomasz
Reviewed By: daviddeng
CC: hbase-eng@, andrewcox, jiqingt, elliott, gauravm
Differential Revision: https://phabricator.fb.com/D1279500
Modified:
hbase/branches/0.89-fb/pom.xml
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestRpcMetricWrapper.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
Modified: hbase/branches/0.89-fb/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/pom.xml?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/pom.xml (original)
+++ hbase/branches/0.89-fb/pom.xml Thu Apr 17 00:49:21 2014
@@ -846,6 +846,21 @@
<artifactId>asm</artifactId>
<version>3.2</version>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.1.0.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>com.facebook.swift</groupId>
+ <artifactId>swift-annotations</artifactId>
+ <version>0.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.9.5</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Apr 17 00:49:21 2014
@@ -1792,12 +1792,12 @@ public class HRegionServer implements HR
if (this.fs instanceof DistributedFileSystem) {
DFSClient client = ((DistributedFileSystem)fs).getClient();
- long quorumReadsDone = client.quorumReadMetrics.getParallelReadOps();
+ long quorumReadsDone = client.getQuorumReadMetrics().getParallelReadOps();
this.metrics.quorumReadsDone.set(quorumReadsDone);
- long quorumReadWins = client.quorumReadMetrics.getParallelReadWins();
+ long quorumReadWins = client.getQuorumReadMetrics().getParallelReadWins();
this.metrics.quorumReadWins.set(quorumReadWins);
long quorumReadsExecutedInCurThread =
- client.quorumReadMetrics.getParallelReadOpsInCurThread();
+ client.getQuorumReadMetrics().getParallelReadOpsInCurThread();
this.metrics.quorumReadsExecutedInCurThread.set(quorumReadsExecutedInCurThread);
}
}
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java Thu Apr 17 00:49:21 2014
@@ -47,6 +47,7 @@ import org.apache.hadoop.hbase.master.HM
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.tools.DFSAdmin;
import org.apache.hadoop.io.MapWritable;
import org.apache.hadoop.io.SequenceFile;
@@ -289,7 +290,7 @@ public class FSUtils {
// the datanode report, just ignore it
}
// Make sure dfs is not in safe mode
- while (dfs.setSafeMode(FSConstants.SafeModeAction.SAFEMODE_GET)) {
+ while (DFSAdmin.getSafeMode(dfs, conf)) {
LOG.info("Waiting for dfs to exit safe mode...");
try {
Thread.sleep(wait);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Thu Apr 17 00:49:21 2014
@@ -97,6 +97,7 @@ import org.apache.hadoop.hbase.zookeeper
import org.apache.hadoop.hdfs.DFSClient;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.mapred.MiniMRCluster;
import org.apache.hadoop.mapred.TaskLog;
@@ -266,15 +267,17 @@ public class HBaseTestingUtility {
*/
public MiniDFSCluster startMiniDFSCluster(int servers) throws IOException {
createDirsAndSetProperties();
- this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,
- true, null, null, null, null);
+ this.dfsCluster = new MiniDFSCluster.Builder(this.conf).nameNodePort(0)
+ .numDataNodes(servers).format(true).manageDataDfsDirs(true)
+ .manageNameDfsDirs(true).build();
return this.dfsCluster;
}
public MiniDFSCluster startMiniDFSClusterForTestHLog(int namenodePort) throws IOException {
createDirsAndSetProperties();
- dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,
- null, null, null);
+ this.dfsCluster = new MiniDFSCluster.Builder(this.conf).nameNodePort(0)
+ .numDataNodes(5).format(false).manageDataDfsDirs(true)
+ .manageNameDfsDirs(true).build();
return dfsCluster;
}
@@ -428,7 +431,9 @@ public class HBaseTestingUtility {
this.conf.set("fs.defaultFS", fs.getUri().toString());
// Do old style too just to be safe.
this.conf.set("fs.default.name", fs.getUri().toString());
- this.dfsCluster.waitClusterUp();
+ for (DataNode dn : dfsCluster.getDataNodes()) {
+ this.dfsCluster.waitDataNodeInitialized(dn);
+ }
hbaseRootdir = fs.getHomeDirectory();
break;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java Thu Apr 17 00:49:21 2014
@@ -1198,7 +1198,8 @@ public class PerformanceEvaluation {
MiniDFSCluster dfsCluster = null;
MiniZooKeeperCluster zooKeeperCluster = null;
if (this.miniCluster) {
- dfsCluster = new MiniDFSCluster(conf, 2, true, (String[])null);
+ dfsCluster = new MiniDFSCluster.Builder(conf).numDataNodes(2)
+ .manageDataDfsDirs(true).manageNameDfsDirs(true).build();
zooKeeperCluster = new MiniZooKeeperCluster();
int zooKeeperPort = zooKeeperCluster.startup(new File(System.getProperty("java.io.tmpdir")));
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java Thu Apr 17 00:49:21 2014
@@ -61,7 +61,8 @@ public class TestGetClosestAtOrBefore ex
@Override
protected void setUp() throws Exception {
super.setUp();
- this.miniHdfs = new MiniDFSCluster(this.conf, 1, true, null);
+ this.miniHdfs = new MiniDFSCluster.Builder(this.conf).numDataNodes(1)
+ .manageDataDfsDirs(true).manageNameDfsDirs(true).build();
// Set the hbase.rootdir to be the home directory in mini dfs.
this.conf.set(HConstants.HBASE_DIR,
this.miniHdfs.getFileSystem().getHomeDirectory().toString());
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java Thu Apr 17 00:49:21 2014
@@ -89,7 +89,8 @@ public class TestScanner extends HBaseTe
@Override
public void setUp() throws Exception {
- cluster = new MiniDFSCluster(conf, 2, true, (String[])null);
+ cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2)
+ .manageDataDfsDirs(true).manageNameDfsDirs(true).build();;
// Set the hbase.rootdir to be the home directory in mini dfs.
this.conf.set(HConstants.HBASE_DIR,
this.cluster.getFileSystem().getHomeDirectory().toString());
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Thu Apr 17 00:49:21 2014
@@ -85,7 +85,8 @@ public class TestStoreFile extends HBase
public void setUp() throws Exception {
startingMetrics = SchemaMetrics.getMetricsSnapshot();
try {
- this.cluster = new MiniDFSCluster(this.conf, 2, true, (String[])null);
+ this.cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2)
+ .manageDataDfsDirs(true).manageNameDfsDirs(true).build();;
// Set the hbase.rootdir to be the home directory in mini dfs.
this.conf.set(HConstants.HBASE_DIR,
this.cluster.getFileSystem().getHomeDirectory().toString());
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java Thu Apr 17 00:49:21 2014
@@ -70,7 +70,8 @@ public class TestWideScanner extends HBa
@Override
public void setUp() throws Exception {
- cluster = new MiniDFSCluster(conf, 2, true, (String[])null);
+ cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2)
+ .manageDataDfsDirs(true).manageNameDfsDirs(true).build();;
// Set the hbase.rootdir to be the home directory in mini dfs.
this.conf.set(HConstants.HBASE_DIR,
this.cluster.getFileSystem().getHomeDirectory().toString());
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestRpcMetricWrapper.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestRpcMetricWrapper.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestRpcMetricWrapper.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestRpcMetricWrapper.java Thu Apr 17 00:49:21 2014
@@ -82,6 +82,16 @@ class DummyMetricsRecord implements Metr
setMetric(metricName, value.longValue() + (long)metricValue);
}
}
+ @Override
+ public void incrMetric(String arg0, double arg1) {
+ // TODO Auto-generated method stub
+
+ }
+ @Override
+ public void setMetric(String arg0, double arg1) {
+ // TODO Auto-generated method stub
+
+ }
}
public class TestRpcMetricWrapper extends TestCase {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java Thu Apr 17 00:49:21 2014
@@ -69,7 +69,7 @@ import org.junit.runner.RunWith;
public class TestHLog {
private static final Log LOG = LogFactory.getLog(TestHLog.class);
{
- ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ALL);
+ DataNode.LOG.getLogger().setLevel(Level.ALL);
((Log4JLogger)LeaseManager.LOG).getLogger().setLevel(Level.ALL);
((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
((Log4JLogger)DFSClient.LOG).getLogger().setLevel(Level.ALL);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java Thu Apr 17 00:49:21 2014
@@ -63,7 +63,7 @@ public class TestLogRolling extends HBas
// verbose logging on classes that are touched in these tests
{
- ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ALL);
+ DataNode.LOG.getLogger().setLevel(Level.ALL);
((Log4JLogger)LeaseManager.LOG).getLogger().setLevel(Level.ALL);
((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
((Log4JLogger)DFSClient.LOG).getLogger().setLevel(Level.ALL);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java?rev=1588119&r1=1588118&r2=1588119&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java Thu Apr 17 00:49:21 2014
@@ -110,7 +110,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);
+ this.dfsCluster = new MiniDFSCluster.Builder(conf).numDataNodes(2)
+ .manageDataDfsDirs(true).manageNameDfsDirs(true).build();;
this.fs = this.dfsCluster.getFileSystem();
System.out.println("fs=" + this.fs);
this.conf.set("fs.defaultFS", fs.getUri().toString());