implemented topology.worker.childopts

Nathan Marz · Nathan Marz · commit 317710d07a1b · 2012-01-04T23:16:15.000-08:00
diff --git a/src/clj/backtype/storm/daemon/supervisor.clj b/src/clj/backtype/storm/daemon/supervisor.clj
@@ -367,8 +367,11 @@
     :distributed [conf shared-context storm-id supervisor-id port worker-id worker-thread-pids-atom]
     (let [stormroot (supervisor-stormdist-root conf storm-id)
           stormjar (supervisor-stormjar-path stormroot)
+          storm-conf (read-supervisor-storm-conf conf storm-id)
           classpath (add-to-classpath (current-classpath) [stormjar])
-          childopts (.replaceAll (conf WORKER-CHILDOPTS) "%ID%" (str port))
+          childopts (.replaceAll (str (conf WORKER-CHILDOPTS) " " (storm-conf TOPOLOGY-WORKER-CHILDOPTS))
+                                 "%ID%"
+                                 (str port))
           logfilename (str "worker-" port ".log")
           command (str "java -server " childopts
                        " -Djava.library.path=" (conf JAVA-LIBRARY-PATH)
diff --git a/src/jvm/backtype/storm/Config.java b/src/jvm/backtype/storm/Config.java
@@ -332,6 +332,11 @@ public class Config extends HashMap<String, Object> {
      * Whether or not to use Java serialization in a topology.
      */
     public static String TOPOLOGY_FALL_BACK_ON_JAVA_SERIALIZATION="topology.fall.back.on.java.serialization";
+
+    /**
+     * Topology-specific options for the worker child process. This is used in addition to WORKER_CHILDOPTS.
+     */
+    public static String TOPOLOGY_WORKER_CHILDOPTS="topology.worker.childopts";
     
     /**
      * The number of threads that should be used by the zeromq context in each worker process.
