merge changes from nathanmarz/storm master

CHANGELOG.md

@@ -25,6 +25,9 @@
  * FixedBatchSpout will now replay batches appropriately on batch failure (thanks ptgoetz)
  * Can set JAR_JVM_OPTS env variable to add jvm options when calling 'storm jar' (thanks srmelody)
  * Throw error if batch id for transaction is behind the batch id in the opaque value (thanks mrflip)
+ * Sort topologies by name in UI (thanks jaked)
+ * Added LoggingMetricsConsumer to log all metrics to a file, by default not enabled (thanks mrflip)
+ * Add prepare(Map conf) method to TopologyValidator (thanks ankitoshniwal)
  * Bug fix: Supervisor provides full path to workers to logging config rather than relative path (thanks revans2) 
  * Bug fix: Call ReducerAggregator#init properly when used within persistentAggregate (thanks lorcan)
  * Bug fix: Set component-specific configs correctly for Trident spouts

README.markdown

@@ -74,6 +74,8 @@ You must not remove this notice, or any other, from this software.
 * Tudor Scurtu ([@tscurtu](https://github.com/tscurtu))
 * Homer Strong ([@strongh](https://github.com/strongh))
 * Sean Melody ([@srmelody](https://github.com/srmelody))
+* Jake Donham ([@jaked](https://github.com/jaked))
+* Ankit Toshniwal ([@ankitoshniwal](https://github.com/ankitoshniwal))
 
 ## Acknowledgements
 

storm-core/src/clj/backtype/storm/daemon/nimbus.clj

@@ -877,6 +877,7 @@
   (.prepare inimbus conf (master-inimbus-dir conf))
   (log-message "Starting Nimbus with conf " conf)
   (let [nimbus (nimbus-data conf inimbus)]
+    (.prepare ^backtype.storm.nimbus.ITopologyValidator (:validator nimbus) conf)
     (cleanup-corrupt-topologies! nimbus)
     (doseq [storm-id (.active-storms (:storm-cluster-state nimbus))]
       (transition! nimbus storm-id :startup))

storm-core/src/clj/backtype/storm/ui/core.clj

@@ -103,8 +103,8 @@
       (.get_num_executors t)
       (.get_num_tasks t)
       ])
-   :time-cols [2]
-   :sort-list "[[2,1]]"
+   :time-cols [3]
+   :sort-list "[[0,0]]"
    ))
 
 (defn supervisor-summary-table [summs]

storm-core/src/jvm/backtype/storm/nimbus/DefaultTopologyValidator.java

@@ -5,6 +5,9 @@
 import java.util.Map;
 
 public class DefaultTopologyValidator implements ITopologyValidator {
+    @Override
+    public void prepare(Map StormConf){
+    }
     @Override
     public void validate(String topologyName, Map topologyConf, StormTopology topology) throws InvalidTopologyException {        
     }    

storm-core/src/jvm/backtype/storm/nimbus/ITopologyValidator.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 
 public interface ITopologyValidator {
+    void prepare(Map StormConf);
     void validate(String topologyName, Map topologyConf, StormTopology topology)
             throws InvalidTopologyException;
 }