BIGTOP-3413. QFS doesn't work with Hadoop's TeraGen. (#682)
diff --git a/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy b/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy
index 6f7f07d..43fd4f1 100644
--- a/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy
+++ b/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy
@@ -127,9 +127,6 @@
[
pi: "${pi_maps} ${pi_samples}",
wordcount: "$EXAMPLES/text $EXAMPLES_OUT/wordcount",
- teragen: "${terasort_rows} teragen${terasortid}",
- terasort: "teragen${terasortid} terasort${terasortid}",
- teravalidate: "terasort${terasortid} tervalidate${terasortid}",
multifilewc: "$EXAMPLES/text $EXAMPLES_OUT/multifilewc",
aggregatewordcount: "$EXAMPLES/text $EXAMPLES_OUT/aggregatewordcount 2 textinputformat",
aggregatewordhist: "$EXAMPLES/text $EXAMPLES_OUT/aggregatewordhist 2 textinputformat",
@@ -138,6 +135,15 @@
randomtextwriter: "-D $RANDOMTEXTWRITER_TOTALBYTES=1073741824 $EXAMPLES_OUT/randomtextwriter"
];
+ // The following example MR jobs are enabled only when running without QFS,
+ // which doesn't seem to work with TeraOutputFormat. See BIGTOP-3413 for details.
+ static LinkedHashMap additional_examples =
+ [
+ teragen: "${terasort_rows} teragen${terasortid}",
+ terasort: "teragen${terasortid} terasort${terasortid}",
+ teravalidate: "terasort${terasortid} tervalidate${terasortid}"
+ ];
+
private String testName;
private String testJar;
private String testArgs;
@@ -146,6 +152,9 @@
public static LinkedHashMap<String, Object[]> generateTests() {
LinkedHashMap<String, Object[]> res = [:];
examples.each { k, v -> res[k] = [k.toString(), v.toString()] as Object[]; }
+ if (HADOOP_COMMAND != "hadoop-qfs") {
+ additional_examples.each { k, v -> res[k] = [k.toString(), v.toString()] as Object[]; }
+ }
return res;
}
