Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Adding JVM args.

  • Loading branch information...
commit 77f51be4958569abdaefe03f1ae7b7a58c34d927 1 parent 7e538fb
@rbpark authored
Showing with 11 additions and 4 deletions.
  1. +11 −4 azkaban/src/java/azkaban/jobs/builtin/JavaProcessJob.java
View
15 azkaban/src/java/azkaban/jobs/builtin/JavaProcessJob.java
@@ -35,7 +35,8 @@
public static final String MAX_MEMORY_SIZE = "Xmx";
public static final String MAIN_ARGS = "main.args";
public static final String JVM_PARAMS = "jvm.args";
-
+ public static final String GLOBAL_JVM_PARAMS = "global.jvm.args";
+
public static final String DEFAULT_INITIAL_MEMORY_SIZE = "64M";
public static final String DEFAULT_MAX_MEMORY_SIZE = "256M";
@@ -121,9 +122,15 @@ protected String getMainArguments() {
return getProps().getString(MAIN_ARGS, "");
}
- protected String getJVMArguments() {
- return getProps().getString(JVM_PARAMS, "");
- }
+ protected String getJVMArguments() {
+ String globalJVMArgs = getProps().getString(GLOBAL_JVM_PARAMS, null);
+
+ if (globalJVMArgs == null) {
+ return getProps().getString(JVM_PARAMS, "");
+ }
+
+ return globalJVMArgs + " " + getProps().getString(JVM_PARAMS, "");
+ }
protected String createArguments(List<String> arguments, String separator) {
if (arguments != null && arguments.size() > 0) {
Please sign in to comment.
Something went wrong with that request. Please try again.