[GOBBLIN-390] Add log configs to child process Closes #2266 from yukuai518/log
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/41fd2b92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/41fd2b92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/41fd2b92 Branch: refs/heads/0.12.0 Commit: 41fd2b920fe0dc5b282e2ee26a0a27acd6baa284 Parents: 6a31ef8 Author: Kuai Yu <[email protected]> Authored: Thu Jan 25 15:47:12 2018 -0800 Committer: Hung Tran <[email protected]> Committed: Thu Jan 25 15:47:12 2018 -0800 ---------------------------------------------------------------------- .../gobblin/cluster/GobblinClusterConfigurationKeys.java | 2 ++ .../java/org/apache/gobblin/cluster/SingleTaskLauncher.java | 8 ++++++++ .../java/org/apache/gobblin/cluster/SingleTaskRunner.java | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/41fd2b92/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterConfigurationKeys.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterConfigurationKeys.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterConfigurationKeys.java index de501f1..68a8208 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterConfigurationKeys.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterConfigurationKeys.java @@ -35,6 +35,8 @@ public class GobblinClusterConfigurationKeys { GOBBLIN_CLUSTER_PREFIX + "enableTaskInSeparateProcess"; public static final String TASK_CLASSPATH = GOBBLIN_CLUSTER_PREFIX + "task.classpath"; + public static final String TASK_LOG_CONFIG = + GOBBLIN_CLUSTER_PREFIX + "task.log.config"; // General Gobblin Cluster application configuration properties. public static final String APPLICATION_NAME_OPTION_NAME = "app_name"; http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/41fd2b92/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskLauncher.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskLauncher.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskLauncher.java index 1fe3eaf..e6fac31 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskLauncher.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskLauncher.java @@ -80,6 +80,7 @@ class SingleTaskLauncher { List<String> build() { addJavaBin(); addClassPath(); + addLogConfig(); addClassName(); addOptions(); return this.cmd; @@ -96,6 +97,13 @@ class SingleTaskLauncher { this.cmd.add(javaBinPath.toString()); } + private void addLogConfig() { + if (sysConfig.hasPath(GobblinClusterConfigurationKeys.TASK_LOG_CONFIG)) { + String logConfig = sysConfig.getString(GobblinClusterConfigurationKeys.TASK_LOG_CONFIG); + this.cmd.add(logConfig); + } + } + private void addClassPath() { this.cmd.add("-cp"); String classPath; http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/41fd2b92/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskRunner.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskRunner.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskRunner.java index 6226cf1..7eb87c5 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskRunner.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/SingleTaskRunner.java @@ -38,7 +38,6 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.gobblin.configuration.ConfigurationKeys; -import org.apache.gobblin.runtime.AbstractJobLauncher; import org.apache.gobblin.runtime.TaskExecutor; import org.apache.gobblin.runtime.util.StateStores; import org.apache.gobblin.util.ConfigUtils;
