You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2017/05/24 14:58:55 UTC
apex-core git commit: APEXCORE-719 Pass an application name from
stram client to application master and container via command line properties
Repository: apex-core
Updated Branches:
refs/heads/master 899f4cb0a -> dca51d99e
APEXCORE-719 Pass an application name from stram client to application master and container via command line properties
Added passing of the application name
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/dca51d99
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/dca51d99
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/dca51d99
Branch: refs/heads/master
Commit: dca51d99e6246f99d3150f7b74d2f8368285ddd0
Parents: 899f4cb
Author: Sergey Golovko <se...@datatorrent.com>
Authored: Thu May 11 10:56:28 2017 -0700
Committer: Sergey Golovko <se...@datatorrent.com>
Committed: Wed May 24 07:24:13 2017 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/LaunchContainerRunnable.java | 2 +-
engine/src/main/java/com/datatorrent/stram/StramClient.java | 1 +
.../java/com/datatorrent/stram/client/StramClientUtils.java | 8 ++++++++
3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-core/blob/dca51d99/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java b/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java
index dce648b..75acdf7 100644
--- a/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java
+++ b/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java
@@ -253,6 +253,7 @@ public class LaunchContainerRunnable implements Runnable
vargs.add(String.format("-D%scid=%s", StreamingApplication.DT_PREFIX, jvmID));
vargs.add("-Dhadoop.root.logger=" + (dag.isDebug() ? "DEBUG" : "INFO") + ",RFA");
vargs.add("-Dhadoop.log.dir=" + ApplicationConstants.LOG_DIR_EXPANSION_VAR);
+ StramClientUtils.addAttributeToArgs(LogicalPlan.APPLICATION_NAME, dag, vargs);
String loggersLevel = System.getProperty(StramUtils.DT_LOGGERS_LEVEL);
if (loggersLevel != null) {
@@ -333,5 +334,4 @@ public class LaunchContainerRunnable implements Runnable
throw new RuntimeException("Error generating delegation token", e);
}
}
-
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/dca51d99/engine/src/main/java/com/datatorrent/stram/StramClient.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/StramClient.java b/engine/src/main/java/com/datatorrent/stram/StramClient.java
index 22a1c63..51d52c6 100644
--- a/engine/src/main/java/com/datatorrent/stram/StramClient.java
+++ b/engine/src/main/java/com/datatorrent/stram/StramClient.java
@@ -572,6 +572,7 @@ public class StramClient
vargs.add("-Dhadoop.root.logger=" + (dag.isDebug() ? "DEBUG" : "INFO") + ",RFA");
vargs.add("-Dhadoop.log.dir=" + ApplicationConstants.LOG_DIR_EXPANSION_VAR);
vargs.add(String.format("-D%s=%s", StreamingContainer.PROP_APP_PATH, dag.assertAppPath()));
+ StramClientUtils.addAttributeToArgs(LogicalPlan.APPLICATION_NAME, dag, vargs);
if (dag.isDebug()) {
vargs.add("-Dlog4j.debug=true");
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/dca51d99/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
index 15adab4..eead871 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
@@ -80,6 +80,8 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
+import com.datatorrent.api.Attribute;
+import com.datatorrent.api.Context;
import com.datatorrent.api.StreamingApplication;
import com.datatorrent.stram.StramClient;
import com.datatorrent.stram.StramUtils;
@@ -870,4 +872,10 @@ public class StramClientUtils
return appInfo;
}
+ public static void addAttributeToArgs(Attribute<String> attribute, Context context, List<CharSequence> vargs)
+ {
+ if (context.getValue(attribute) != null) {
+ vargs.add(String.format("-D%s=$'%s'", attribute.getLongName(), context.getValue(attribute).replaceAll("['\"$\\\\]", "\\\\$0")));
+ }
+ }
}