Configurable JVM options for Mesos Executor

mesos · Jan 8, 2015 · 9366b1f · 9366b1f
1 parent a4a8f54
commit 9366b1f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/org/apache/hadoop/mapred/ResourcePolicy.java b/src/main/java/org/apache/hadoop/mapred/ResourcePolicy.java
@@ -313,7 +313,7 @@ public void resourceOffers(SchedulerDriver schedulerDriver,
         scheduler.mesosTrackers.put(httpAddress, new MesosTracker(httpAddress, taskId,
             mapSlots, reduceSlots, scheduler));
 
-        List<String> jvmOpts = Arrays.asList(
+        List<String> defaultJvmOpts = Arrays.asList(
             "-XX:+UseConcMarkSweepGC",
             "-XX:+CMSParallelRemarkEnabled",
             "-XX:+CMSClassUnloadingEnabled",
@@ -330,14 +330,19 @@ public void resourceOffers(SchedulerDriver schedulerDriver,
             "-XX:CMSInitiatingOccupancyFraction=80"
         );
 
+        String jvmOpts = scheduler.conf.get("mapred.mesos.executor.jvm.opts");
+        if (jvmOpts == null) {
+            jvmOpts = StringUtils.join(" ", defaultJvmOpts);
+        }
+
         // Set up the environment for running the TaskTracker.
         Protos.Environment.Builder envBuilder = Protos.Environment
             .newBuilder()
             .addVariables(
                 Protos.Environment.Variable.newBuilder()
                     .setName("HADOOP_OPTS")
                     .setValue(
-                        StringUtils.join(" ", jvmOpts) +
+                        jvmOpts +
                             " -Xmx" + tasktrackerJVMHeap + "m" +
                             " -XX:NewSize=" + tasktrackerJVMHeap / 3 + "m -XX:MaxNewSize=" + (int)Math.floor
                             (tasktrackerJVMHeap * 0.6) + "m"