You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2018/10/08 11:13:18 UTC
ignite git commit: IGNITE-9684: Hadoop: pass JDK 9+ options to nodes
in external processes. This closes #4918.
Repository: ignite
Updated Branches:
refs/heads/master ac04ad4b1 -> dcf30ab76
IGNITE-9684: Hadoop: pass JDK 9+ options to nodes in external processes. This closes #4918.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dcf30ab7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dcf30ab7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dcf30ab7
Branch: refs/heads/master
Commit: dcf30ab764b1649632d6bf9708cd8dd51b4d6f89
Parents: ac04ad4
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Mon Oct 8 14:13:11 2018 +0300
Committer: devozerov <pp...@gmail.com>
Committed: Mon Oct 8 14:13:11 2018 +0300
----------------------------------------------------------------------
.../hadoop/impl/HadoopCommandLineTest.java | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/dcf30ab7/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java
index 2bcc15c..6d4e29e 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java
@@ -28,6 +28,7 @@ import java.io.PrintWriter;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.apache.ignite.IgniteSystemProperties;
@@ -37,6 +38,7 @@ import org.apache.ignite.hadoop.fs.IgniteHadoopFileSystemCounterWriter;
import org.apache.ignite.igfs.IgfsInputStream;
import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils;
import org.apache.ignite.internal.processors.hadoop.HadoopJobEx;
import org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker;
@@ -45,6 +47,8 @@ import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.testframework.junits.IgniteTestResources;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
@@ -250,6 +254,7 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest {
res.environment().put("HADOOP_HOME", hadoopHome);
res.environment().put("HADOOP_CLASSPATH", ggClsPath);
res.environment().put("HADOOP_CONF_DIR", testWorkDir.getAbsolutePath());
+ res.environment().put("HADOOP_OPTS", filteredJvmArgs());
res.redirectErrorStream(true);
@@ -257,6 +262,27 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest {
}
/**
+ * Creates list of JVM arguments to be used to start hadoop process.
+ *
+ * @return JVM arguments.
+ */
+ private String filteredJvmArgs() {
+ StringBuilder filteredJvmArgs = new StringBuilder();
+
+ filteredJvmArgs.append("-ea");
+
+ for (String arg : U.jvmArgs()) {
+ if (arg.startsWith("--add-opens") || arg.startsWith("--add-exports") || arg.startsWith("--add-modules") ||
+ arg.startsWith("--patch-module") || arg.startsWith("--add-reads") ||
+ arg.startsWith("-XX:+IgnoreUnrecognizedVMOptions"))
+ filteredJvmArgs.append(' ').append(arg);
+ }
+
+ return filteredJvmArgs.toString();
+ }
+
+
+ /**
* Waits for process exit and prints the its output.
*
* @param proc Process.