Adding JVM args.

rbpark · Jun 7, 2012 · 77f51be · 77f51be
1 parent 7e538fb
commit 77f51be
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/azkaban/src/java/azkaban/jobs/builtin/JavaProcessJob.java b/azkaban/src/java/azkaban/jobs/builtin/JavaProcessJob.java
@@ -35,7 +35,8 @@ public class JavaProcessJob extends ProcessJob {
 	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() {
+    protected String getJVMArguments() {
-		return getProps().getString(JVM_PARAMS, "");
+        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) {