ACCUMULO-1893 keep tests from attempting to write to the root of HDFS. Reapplication of part of ACCUMULO-1563 to current branch.
Author: Jon Hsieh <jmhs...@apache.org> Signed-off-by: Keith Turner <ktur...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d0ceebbf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d0ceebbf Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d0ceebbf Branch: refs/heads/master Commit: d0ceebbf0ae8198ec68f3d581c259013c73f4664 Parents: 6caa159 Author: Sean Busbey <bus...@clouderagovt.com> Authored: Thu Nov 14 14:10:52 2013 -0600 Committer: Keith Turner <ktur...@apache.org> Committed: Mon Nov 25 08:43:37 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/test/CreateMapFiles.java | 2 +- .../server/test/functional/BulkSplitOptimizationTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d0ceebbf/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java b/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java index a571894..9ffea43 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java +++ b/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java @@ -39,7 +39,7 @@ public class CreateMapFiles { int count = 0; while (currEnd <= end && currStart < currEnd) { - final String tia = String.format("-mapFile /%s/mf%05d -timestamp 1 -size 50 -random 56 %d %d 1", dir, count, currEnd - currStart, currStart); + final String tia = String.format("-mapFile %s/mf%05d -timestamp 1 -size 50 -random 56 %d %d 1", dir, count, currEnd - currStart, currStart); Runnable r = new Runnable() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d0ceebbf/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java b/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java index 3af4144..137239c2 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java +++ b/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java @@ -42,8 +42,8 @@ public class BulkSplitOptimizationTest extends FunctionalTest { @Override public void cleanup() throws Exception { FileSystem fs = FileSystem.get(CachedConfiguration.getInstance()); - fs.delete(new Path("/tmp/testmf"), true); - fs.delete(new Path("/tmp/testmf_failures"), true); + fs.delete(new Path("tmp/testmf"), true); + fs.delete(new Path("tmp/testmf_failures"), true); } @Override @@ -61,11 +61,11 @@ public class BulkSplitOptimizationTest extends FunctionalTest { public void run() throws Exception { FileSystem fs = FileSystem.get(CachedConfiguration.getInstance()); - fs.delete(new Path("/tmp/testmf"), true); + fs.delete(new Path("tmp/testmf"), true); CreateMapFiles.main(new String[] {"tmp/testmf", "8", "0", "100000", "99"}); - bulkImport(fs, TABLE_NAME, "/tmp/testmf"); + bulkImport(fs, TABLE_NAME, "tmp/testmf"); checkSplits(TABLE_NAME, 0, 0); checkMapFiles(TABLE_NAME, 1, 1, 100, 100);
