merge master

Nathan Marz · Nathan Marz · commit fc63b2d286a7 · 2012-01-25T16:00:45.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## SNAPSHOT
+
+ * Bug fix: "storm supervisor" now uses supervisor.childopts instead of nimbus.childopts
+ * Bug fix: supervisor.childopts and nimbus.childopts can now contain whitespace. Previously only the first token was taken from the string
+
 ## 0.6.2
 
  * Automatically delete old files in Nimbus's inbox. Configurable with "nimbus.cleanup.inbox.freq.secs" and "nimbus.inbox.jar.expiration.secs"
diff --git a/bin/storm b/bin/storm
@@ -53,7 +53,7 @@ def confvalue(name, extrapaths):
     for line in lines:
         tokens = line.split(" ")
         if tokens[0] == "VALUE:":
-            return tokens[1]
+            return " ".join(tokens[1:])
 
 def print_localconfvalue(name):
   print name + ": " + confvalue(name, [CONF_DIR])
@@ -106,11 +106,12 @@ def nimbus():
 
 def supervisor():
     cppaths = [STORM_DIR + "/log4j", STORM_DIR + "/conf"]
-    childopts = confvalue("nimbus.childopts", cppaths) + " -Dlogfile.name=supervisor.log -Dlog4j.configuration=storm.log.properties"
+    childopts = confvalue("supervisor.childopts", cppaths) + " -Dlogfile.name=supervisor.log -Dlog4j.configuration=storm.log.properties"
     exec_storm_class("backtype.storm.daemon.supervisor", jvmtype="-server", extrajars=cppaths, childopts=childopts)
 
 def ui():
-    childopts = "-Xmx768m -Dlogfile.name=ui.log -Dlog4j.configuration=storm.log.properties"
+    cppaths = [STORM_DIR + "/log4j", STORM_DIR + "/conf"]
+    childopts = confvalue("ui.childopts", cppaths) + " -Dlogfile.name=ui.log -Dlog4j.configuration=storm.log.properties"
     exec_storm_class("backtype.storm.ui.core", jvmtype="-server", childopts=childopts, extrajars=[STORM_DIR + "/log4j", STORM_DIR, STORM_DIR + "/conf"])
 
 def drpc():
@@ -120,11 +121,6 @@ def drpc():
 def print_classpath():
   print get_classpath([])
 
-COMMANDS = {"jar": jar, "kill": kill, "shell": shell, "nimbus": nimbus, "ui": ui,
-            "drpc": drpc, "supervisor": supervisor, "localconfvalue": print_localconfvalue,
-            "remoteconfvalue": print_remoteconfvalue, "repl": repl, "classpath": print_classpath,
-            "activate": activate, "deactivate": deactivate, "rebalance": rebalance}
-
 def print_commands():
     global COMMANDS
     cmds = COMMANDS.keys()
@@ -137,14 +133,19 @@ def print_usage(msg=None):
         print msg
     print_commands()
 
+COMMANDS = {"jar": jar, "kill": kill, "shell": shell, "nimbus": nimbus, "ui": ui,
+            "drpc": drpc, "supervisor": supervisor, "localconfvalue": print_localconfvalue,
+            "remoteconfvalue": print_remoteconfvalue, "repl": repl, "classpath": print_classpath,
+            "activate": activate, "deactivate": deactivate, "rebalance": rebalance, "help": print_usage}
+
 def main():
     if len(sys.argv) <= 1:
         print_usage()
         sys.exit(-1)
 
     COMMAND = sys.argv[1]
     ARGS = sys.argv[2:]
-    COMMANDS[COMMAND](*ARGS)
+    (COMMANDS.get(COMMAND, "help"))(*ARGS)
     
 if __name__ == "__main__":
     main()
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
@@ -24,7 +24,9 @@ nimbus.task.launch.secs: 120
 nimbus.reassign: true
 nimbus.file.copy.expiration.secs: 600
 
+### ui.* configs are for the master
 ui.port: 8080
+ui.childopts: "-Xmx768m"
 
 drpc.port: 3772
 drpc.invocations.port: 3773
diff --git a/src/clj/backtype/storm/util.clj b/src/clj/backtype/storm/util.clj
@@ -115,8 +115,7 @@
     (toks->path (conj toks name))
     ))
 
-(defn not-nil? [o]
-  (not (nil? o)))
+(def not-nil? (complement nil?))
 
 (defn barr [& vals]
   (byte-array (map byte vals)))
@@ -519,7 +518,7 @@
     ))
 
 (defn nil-to-zero [v]
-  (if v v 0))
+  (or v 0))
 
 (defn bit-xor-vals [vals]
   (reduce bit-xor 0 vals))
diff --git a/src/jvm/backtype/storm/Config.java b/src/jvm/backtype/storm/Config.java
@@ -154,6 +154,12 @@ public class Config extends HashMap<String, Object> {
      */
     public static String UI_PORT = "ui.port";
 
+    /**
+     * Childopts for Storm UI Java process.
+     */
+    public static String UI_CHILDOPTS = "ui.childopts";
+    
+    
     /**
      * List of DRPC servers so that the DRPCSpout knows who to talk to.
      */
