Repository: accumulo
Updated Branches:
  refs/heads/master 7be2f04e5 -> b4cd908a3


ACCUMULO-4124 run sub-jobs in local mode


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4cd908a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4cd908a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4cd908a

Branch: refs/heads/master
Commit: b4cd908a3cef731b0d7154b94097c7ce0eea4e09
Parents: 7be2f04
Author: Eric C. Newton <eric.new...@gmail.com>
Authored: Tue Feb 2 15:27:30 2016 -0500
Committer: Eric C. Newton <eric.new...@gmail.com>
Committed: Tue Feb 2 15:27:30 2016 -0500

----------------------------------------------------------------------
 .../accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java  | 1 +
 .../org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java | 1 +
 .../java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java | 1 +
 .../accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java       | 1 +
 .../org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java     | 1 +
 .../org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java   | 1 +
 test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java | 1 +
 .../apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java  | 1 +
 .../org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java   | 1 +
 .../accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java    | 1 +
 .../org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java  | 1 +
 .../apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java    | 1 +
 .../main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java   | 1 +
 13 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
index b2b6aff..69d30af 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
@@ -260,6 +260,7 @@ public class ChunkInputFormatIT extends 
AccumuloClusterHarness {
 
     public static int main(String... args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       return ToolRunner.run(conf, new CIFTester(), args);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
index dd085cc..fda3713 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
@@ -166,6 +166,7 @@ public class AccumuloFileOutputFormatIT extends 
AccumuloClusterHarness {
 
     public static void main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
index cd80139..2a15041 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
@@ -142,6 +142,7 @@ public class AccumuloInputFormatIT extends 
AccumuloClusterHarness {
 
     public static void main(String... args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
index 35ba7bc..fb3177a 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
@@ -129,6 +129,7 @@ public class AccumuloMultiTableInputFormatIT extends 
AccumuloClusterHarness {
 
     public static void main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
index bb48761..049a5da 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
@@ -192,6 +192,7 @@ public class AccumuloOutputFormatIT extends 
ConfigurableMacBase {
 
     public static void main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
index d266d3d..98978dc 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
@@ -174,6 +174,7 @@ public class AccumuloRowInputFormatIT extends 
AccumuloClusterHarness {
 
     public static void main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java 
b/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
index e30a033..78fc76d 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
@@ -131,6 +131,7 @@ public class TokenFileIT extends AccumuloClusterHarness {
     public static void main(String[] args) throws Exception {
       Configuration conf = CachedConfiguration.getInstance();
       conf.set("hadoop.tmp.dir", new File(args[0]).getParent());
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTokenFileTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
index d00a9b3..883a657 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
@@ -180,6 +180,7 @@ public class AccumuloFileOutputFormatIT extends 
AccumuloClusterHarness {
 
     public static void main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
index 0a5bd68..a094149 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
@@ -320,6 +320,7 @@ public class AccumuloInputFormatIT extends 
AccumuloClusterHarness {
 
     public static int main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       return ToolRunner.run(conf, new MRTester(), args);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
index 1694f6b..bd7ea42 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
@@ -124,6 +124,7 @@ public class AccumuloMultiTableInputFormatIT extends 
AccumuloClusterHarness {
 
     public static void main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
index c9307ae..811f3fe 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
@@ -119,6 +119,7 @@ public class AccumuloOutputFormatIT extends 
AccumuloClusterHarness {
 
     public static void main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
index 617a8c2..1275bf9 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
@@ -169,6 +169,7 @@ public class AccumuloRowInputFormatIT extends 
AccumuloClusterHarness {
 
     public static void main(String[] args) throws Exception {
       Configuration conf = new Configuration();
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
----------------------------------------------------------------------
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java 
b/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
index f5deebb..6c3b9ef 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
@@ -124,6 +124,7 @@ public class TokenFileIT extends AccumuloClusterHarness {
     public static void main(String[] args) throws Exception {
       Configuration conf = CachedConfiguration.getInstance();
       conf.set("hadoop.tmp.dir", new File(args[0]).getParent());
+      conf.set("mapreduce.framework.name", "local");
       conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
       assertEquals(0, ToolRunner.run(conf, new MRTokenFileTester(), args));
     }

Reply via email to