HBASE-20778 Make it so WALPE runs on DFS
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/daad1442 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/daad1442 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/daad1442 Branch: refs/heads/HBASE-19064 Commit: daad14428d20dfaa66dcbe08be3259e6de726f89 Parents: 959d9c1 Author: Michael Stack <st...@apache.org> Authored: Wed Jun 20 22:25:21 2018 -0700 Committer: Michael Stack <st...@apache.org> Committed: Sat Jun 23 23:33:53 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/wal/WALPerformanceEvaluation.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/daad1442/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java index 9a8bddf..e04ade6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java @@ -117,7 +117,6 @@ public final class WALPerformanceEvaluation extends Configured implements Tool { @Override public void setConf(Configuration conf) { super.setConf(conf); - TEST_UTIL = new HBaseTestingUtility(conf); } /** @@ -301,11 +300,15 @@ public final class WALPerformanceEvaluation extends Configured implements Tool { // In regionserver, number of handlers == number of threads. getConf().setInt(HConstants.REGION_SERVER_HANDLER_COUNT, numThreads); + if (rootRegionDir == null) { + TEST_UTIL = new HBaseTestingUtility(getConf()); + rootRegionDir = TEST_UTIL.getDataTestDirOnTestFS("WALPerformanceEvaluation"); + } // Run WAL Performance Evaluation // First set the fs from configs. In case we are on hadoop1 FSUtils.setFsDefault(getConf(), FSUtils.getRootDir(getConf())); FileSystem fs = FileSystem.get(getConf()); - LOG.info("FileSystem: " + fs); + LOG.info("FileSystem={}, rootDir={}", fs, rootRegionDir); SpanReceiverHost receiverHost = trace ? SpanReceiverHost.getInstance(getConf()) : null; final Sampler sampler = trace ? Sampler.ALWAYS : Sampler.NEVER; @@ -313,9 +316,6 @@ public final class WALPerformanceEvaluation extends Configured implements Tool { TraceScope scope = TraceUtil.createTrace("WALPerfEval"); try { - if (rootRegionDir == null) { - rootRegionDir = TEST_UTIL.getDataTestDirOnTestFS("WALPerformanceEvaluation"); - } rootRegionDir = rootRegionDir.makeQualified(fs.getUri(), fs.getWorkingDirectory()); cleanRegionRootDir(fs, rootRegionDir); FSUtils.setRootDir(getConf(), rootRegionDir);
