Skip to content

Commit 8005398

Browse files
author
iveselovskiy
committed
Version #1: Hadoop terasort test workable in multi-JVM via #isMultiJvm
1 parent 6090ebd commit 8005398

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,13 @@ public IgniteProcessProxy(IgniteConfiguration cfg, IgniteLogger log, Ignite locJ
130130
filteredJvmArgs.add("-D" + IgniteTestResources.MARSH_CLASS_NAME + "=" + marsh.getClass().getName());
131131

132132
for (String arg : U.jvmArgs()) {
133-
if (arg.startsWith("-Xmx") || arg.startsWith("-Xms") ||
134-
arg.startsWith("-cp") || arg.startsWith("-classpath") ||
135-
(marsh != null && arg.startsWith("-D" + IgniteTestResources.MARSH_CLASS_NAME)))
133+
//System.out.println("### [" + arg + "]");
134+
135+
if (arg.startsWith("-Xmx") || arg.startsWith("-Xms")
136+
|| arg.startsWith("-XX")
137+
// TODO: looks like classpath args never go there:
138+
//arg.startsWith("-cp") || arg.startsWith("-classpath") ||
139+
|| (marsh != null && arg.startsWith("-D" + IgniteTestResources.MARSH_CLASS_NAME)))
136140
filteredJvmArgs.add(arg);
137141
}
138142

modules/hadoop/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@
101101
<scope>test</scope>
102102
</dependency>
103103

104+
<dependency>
105+
<groupId>com.thoughtworks.xstream</groupId>
106+
<artifactId>xstream</artifactId>
107+
<version>1.4.8</version>
108+
<scope>test</scope>
109+
</dependency>
110+
104111
<dependency>
105112
<groupId>org.gridgain</groupId>
106113
<artifactId>ignite-shmem</artifactId>

modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ public class HadoopTeraSortTest extends HadoopAbstractSelfTest {
6464
/** Validation destination dir. */
6565
protected final String validateOutDir = getFsBase() + "/tera-validated";
6666

67+
/** {@inheritDoc} */
68+
@Override protected boolean isMultiJvm() {
69+
return true;
70+
}
71+
6772
/**
6873
* Extracts value of Hadoop package-private constant.
6974
*

0 commit comments

Comments
 (0)