You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/09/21 19:40:53 UTC

[08/24] storm git commit: nimbus api and stormbase changes to support component level debug

nimbus api and stormbase changes to support component level debug


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/306ec57d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/306ec57d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/306ec57d

Branch: refs/heads/master
Commit: 306ec57d9cebaaa8f5b9caa0c6fcfb256702bc77
Parents: 5914944
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Sun Aug 9 18:27:47 2015 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Mon Aug 10 14:22:35 2015 +0530

----------------------------------------------------------------------
 .../backtype/storm/generated/Assignment.java    | 194 +++++-----
 .../storm/generated/ClusterWorkerHeartbeat.java |  55 ++-
 .../backtype/storm/generated/Credentials.java   |  46 +--
 .../storm/generated/LSApprovedWorkers.java      |  46 +--
 .../generated/LSSupervisorAssignments.java      |  50 +--
 .../storm/generated/LSWorkerHeartbeat.java      |  38 +-
 .../storm/generated/LocalAssignment.java        |  38 +-
 .../storm/generated/LocalStateData.java         |  50 +--
 .../jvm/backtype/storm/generated/Nimbus.java    | 144 +++++++-
 .../jvm/backtype/storm/generated/NodeInfo.java  |  34 +-
 .../storm/generated/RebalanceOptions.java       |  46 +--
 .../jvm/backtype/storm/generated/StormBase.java | 223 +++++++-----
 .../storm/generated/SupervisorInfo.java         | 110 +++---
 .../backtype/storm/generated/TopologyInfo.java  | 248 ++++++++-----
 storm-core/src/py/storm/Nimbus-remote           |   8 +-
 storm-core/src/py/storm/Nimbus.py               |  32 +-
 storm-core/src/py/storm/ttypes.py               | 352 ++++++++++---------
 storm-core/src/storm.thrift                     |   6 +-
 18 files changed, 990 insertions(+), 730 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/Assignment.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Assignment.java b/storm-core/src/jvm/backtype/storm/generated/Assignment.java
index 2e6e8a3..933bbe1 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Assignment.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Assignment.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-5")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class Assignment implements org.apache.thrift.TBase<Assignment, Assignment._Fields>, java.io.Serializable, Cloneable, Comparable<Assignment> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Assignment");
 
@@ -678,15 +678,15 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
           case 2: // NODE_HOST
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map370 = iprot.readMapBegin();
-                struct.node_host = new HashMap<String,String>(2*_map370.size);
-                String _key371;
-                String _val372;
-                for (int _i373 = 0; _i373 < _map370.size; ++_i373)
+                org.apache.thrift.protocol.TMap _map380 = iprot.readMapBegin();
+                struct.node_host = new HashMap<String,String>(2*_map380.size);
+                String _key381;
+                String _val382;
+                for (int _i383 = 0; _i383 < _map380.size; ++_i383)
                 {
-                  _key371 = iprot.readString();
-                  _val372 = iprot.readString();
-                  struct.node_host.put(_key371, _val372);
+                  _key381 = iprot.readString();
+                  _val382 = iprot.readString();
+                  struct.node_host.put(_key381, _val382);
                 }
                 iprot.readMapEnd();
               }
@@ -698,26 +698,26 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
           case 3: // EXECUTOR_NODE_PORT
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map374 = iprot.readMapBegin();
-                struct.executor_node_port = new HashMap<List<Long>,NodeInfo>(2*_map374.size);
-                List<Long> _key375;
-                NodeInfo _val376;
-                for (int _i377 = 0; _i377 < _map374.size; ++_i377)
+                org.apache.thrift.protocol.TMap _map384 = iprot.readMapBegin();
+                struct.executor_node_port = new HashMap<List<Long>,NodeInfo>(2*_map384.size);
+                List<Long> _key385;
+                NodeInfo _val386;
+                for (int _i387 = 0; _i387 < _map384.size; ++_i387)
                 {
                   {
-                    org.apache.thrift.protocol.TList _list378 = iprot.readListBegin();
-                    _key375 = new ArrayList<Long>(_list378.size);
-                    long _elem379;
-                    for (int _i380 = 0; _i380 < _list378.size; ++_i380)
+                    org.apache.thrift.protocol.TList _list388 = iprot.readListBegin();
+                    _key385 = new ArrayList<Long>(_list388.size);
+                    long _elem389;
+                    for (int _i390 = 0; _i390 < _list388.size; ++_i390)
                     {
-                      _elem379 = iprot.readI64();
-                      _key375.add(_elem379);
+                      _elem389 = iprot.readI64();
+                      _key385.add(_elem389);
                     }
                     iprot.readListEnd();
                   }
-                  _val376 = new NodeInfo();
-                  _val376.read(iprot);
-                  struct.executor_node_port.put(_key375, _val376);
+                  _val386 = new NodeInfo();
+                  _val386.read(iprot);
+                  struct.executor_node_port.put(_key385, _val386);
                 }
                 iprot.readMapEnd();
               }
@@ -729,25 +729,25 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
           case 4: // EXECUTOR_START_TIME_SECS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map381 = iprot.readMapBegin();
-                struct.executor_start_time_secs = new HashMap<List<Long>,Long>(2*_map381.size);
-                List<Long> _key382;
-                long _val383;
-                for (int _i384 = 0; _i384 < _map381.size; ++_i384)
+                org.apache.thrift.protocol.TMap _map391 = iprot.readMapBegin();
+                struct.executor_start_time_secs = new HashMap<List<Long>,Long>(2*_map391.size);
+                List<Long> _key392;
+                long _val393;
+                for (int _i394 = 0; _i394 < _map391.size; ++_i394)
                 {
                   {
-                    org.apache.thrift.protocol.TList _list385 = iprot.readListBegin();
-                    _key382 = new ArrayList<Long>(_list385.size);
-                    long _elem386;
-                    for (int _i387 = 0; _i387 < _list385.size; ++_i387)
+                    org.apache.thrift.protocol.TList _list395 = iprot.readListBegin();
+                    _key392 = new ArrayList<Long>(_list395.size);
+                    long _elem396;
+                    for (int _i397 = 0; _i397 < _list395.size; ++_i397)
                     {
-                      _elem386 = iprot.readI64();
-                      _key382.add(_elem386);
+                      _elem396 = iprot.readI64();
+                      _key392.add(_elem396);
                     }
                     iprot.readListEnd();
                   }
-                  _val383 = iprot.readI64();
-                  struct.executor_start_time_secs.put(_key382, _val383);
+                  _val393 = iprot.readI64();
+                  struct.executor_start_time_secs.put(_key392, _val393);
                 }
                 iprot.readMapEnd();
               }
@@ -779,10 +779,10 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
           oprot.writeFieldBegin(NODE_HOST_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.node_host.size()));
-            for (Map.Entry<String, String> _iter388 : struct.node_host.entrySet())
+            for (Map.Entry<String, String> _iter398 : struct.node_host.entrySet())
             {
-              oprot.writeString(_iter388.getKey());
-              oprot.writeString(_iter388.getValue());
+              oprot.writeString(_iter398.getKey());
+              oprot.writeString(_iter398.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -794,17 +794,17 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
           oprot.writeFieldBegin(EXECUTOR_NODE_PORT_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRUCT, struct.executor_node_port.size()));
-            for (Map.Entry<List<Long>, NodeInfo> _iter389 : struct.executor_node_port.entrySet())
+            for (Map.Entry<List<Long>, NodeInfo> _iter399 : struct.executor_node_port.entrySet())
             {
               {
-                oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter389.getKey().size()));
-                for (long _iter390 : _iter389.getKey())
+                oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter399.getKey().size()));
+                for (long _iter400 : _iter399.getKey())
                 {
-                  oprot.writeI64(_iter390);
+                  oprot.writeI64(_iter400);
                 }
                 oprot.writeListEnd();
               }
-              _iter389.getValue().write(oprot);
+              _iter399.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -816,17 +816,17 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
           oprot.writeFieldBegin(EXECUTOR_START_TIME_SECS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.I64, struct.executor_start_time_secs.size()));
-            for (Map.Entry<List<Long>, Long> _iter391 : struct.executor_start_time_secs.entrySet())
+            for (Map.Entry<List<Long>, Long> _iter401 : struct.executor_start_time_secs.entrySet())
             {
               {
-                oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter391.getKey().size()));
-                for (long _iter392 : _iter391.getKey())
+                oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter401.getKey().size()));
+                for (long _iter402 : _iter401.getKey())
                 {
-                  oprot.writeI64(_iter392);
+                  oprot.writeI64(_iter402);
                 }
                 oprot.writeListEnd();
               }
-              oprot.writeI64(_iter391.getValue());
+              oprot.writeI64(_iter401.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -865,42 +865,42 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       if (struct.is_set_node_host()) {
         {
           oprot.writeI32(struct.node_host.size());
-          for (Map.Entry<String, String> _iter393 : struct.node_host.entrySet())
+          for (Map.Entry<String, String> _iter403 : struct.node_host.entrySet())
           {
-            oprot.writeString(_iter393.getKey());
-            oprot.writeString(_iter393.getValue());
+            oprot.writeString(_iter403.getKey());
+            oprot.writeString(_iter403.getValue());
           }
         }
       }
       if (struct.is_set_executor_node_port()) {
         {
           oprot.writeI32(struct.executor_node_port.size());
-          for (Map.Entry<List<Long>, NodeInfo> _iter394 : struct.executor_node_port.entrySet())
+          for (Map.Entry<List<Long>, NodeInfo> _iter404 : struct.executor_node_port.entrySet())
           {
             {
-              oprot.writeI32(_iter394.getKey().size());
-              for (long _iter395 : _iter394.getKey())
+              oprot.writeI32(_iter404.getKey().size());
+              for (long _iter405 : _iter404.getKey())
               {
-                oprot.writeI64(_iter395);
+                oprot.writeI64(_iter405);
               }
             }
-            _iter394.getValue().write(oprot);
+            _iter404.getValue().write(oprot);
           }
         }
       }
       if (struct.is_set_executor_start_time_secs()) {
         {
           oprot.writeI32(struct.executor_start_time_secs.size());
-          for (Map.Entry<List<Long>, Long> _iter396 : struct.executor_start_time_secs.entrySet())
+          for (Map.Entry<List<Long>, Long> _iter406 : struct.executor_start_time_secs.entrySet())
           {
             {
-              oprot.writeI32(_iter396.getKey().size());
-              for (long _iter397 : _iter396.getKey())
+              oprot.writeI32(_iter406.getKey().size());
+              for (long _iter407 : _iter406.getKey())
               {
-                oprot.writeI64(_iter397);
+                oprot.writeI64(_iter407);
               }
             }
-            oprot.writeI64(_iter396.getValue());
+            oprot.writeI64(_iter406.getValue());
           }
         }
       }
@@ -914,64 +914,64 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map398 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.node_host = new HashMap<String,String>(2*_map398.size);
-          String _key399;
-          String _val400;
-          for (int _i401 = 0; _i401 < _map398.size; ++_i401)
+          org.apache.thrift.protocol.TMap _map408 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.node_host = new HashMap<String,String>(2*_map408.size);
+          String _key409;
+          String _val410;
+          for (int _i411 = 0; _i411 < _map408.size; ++_i411)
           {
-            _key399 = iprot.readString();
-            _val400 = iprot.readString();
-            struct.node_host.put(_key399, _val400);
+            _key409 = iprot.readString();
+            _val410 = iprot.readString();
+            struct.node_host.put(_key409, _val410);
           }
         }
         struct.set_node_host_isSet(true);
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map402 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.executor_node_port = new HashMap<List<Long>,NodeInfo>(2*_map402.size);
-          List<Long> _key403;
-          NodeInfo _val404;
-          for (int _i405 = 0; _i405 < _map402.size; ++_i405)
+          org.apache.thrift.protocol.TMap _map412 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.executor_node_port = new HashMap<List<Long>,NodeInfo>(2*_map412.size);
+          List<Long> _key413;
+          NodeInfo _val414;
+          for (int _i415 = 0; _i415 < _map412.size; ++_i415)
           {
             {
-              org.apache.thrift.protocol.TList _list406 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
-              _key403 = new ArrayList<Long>(_list406.size);
-              long _elem407;
-              for (int _i408 = 0; _i408 < _list406.size; ++_i408)
+              org.apache.thrift.protocol.TList _list416 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+              _key413 = new ArrayList<Long>(_list416.size);
+              long _elem417;
+              for (int _i418 = 0; _i418 < _list416.size; ++_i418)
               {
-                _elem407 = iprot.readI64();
-                _key403.add(_elem407);
+                _elem417 = iprot.readI64();
+                _key413.add(_elem417);
               }
             }
-            _val404 = new NodeInfo();
-            _val404.read(iprot);
-            struct.executor_node_port.put(_key403, _val404);
+            _val414 = new NodeInfo();
+            _val414.read(iprot);
+            struct.executor_node_port.put(_key413, _val414);
           }
         }
         struct.set_executor_node_port_isSet(true);
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map409 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.I64, iprot.readI32());
-          struct.executor_start_time_secs = new HashMap<List<Long>,Long>(2*_map409.size);
-          List<Long> _key410;
-          long _val411;
-          for (int _i412 = 0; _i412 < _map409.size; ++_i412)
+          org.apache.thrift.protocol.TMap _map419 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          struct.executor_start_time_secs = new HashMap<List<Long>,Long>(2*_map419.size);
+          List<Long> _key420;
+          long _val421;
+          for (int _i422 = 0; _i422 < _map419.size; ++_i422)
           {
             {
-              org.apache.thrift.protocol.TList _list413 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
-              _key410 = new ArrayList<Long>(_list413.size);
-              long _elem414;
-              for (int _i415 = 0; _i415 < _list413.size; ++_i415)
+              org.apache.thrift.protocol.TList _list423 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+              _key420 = new ArrayList<Long>(_list423.size);
+              long _elem424;
+              for (int _i425 = 0; _i425 < _list423.size; ++_i425)
               {
-                _elem414 = iprot.readI64();
-                _key410.add(_elem414);
+                _elem424 = iprot.readI64();
+                _key420.add(_elem424);
               }
             }
-            _val411 = iprot.readI64();
-            struct.executor_start_time_secs.put(_key410, _val411);
+            _val421 = iprot.readI64();
+            struct.executor_start_time_secs.put(_key420, _val421);
           }
         }
         struct.set_executor_start_time_secs_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
index f60540b..424ff41 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
@@ -51,8 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-8")
-
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWorkerHeartbeat, ClusterWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterWorkerHeartbeat> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterWorkerHeartbeat");
 
@@ -636,17 +635,17 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
           case 2: // EXECUTOR_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map426 = iprot.readMapBegin();
-                struct.executor_stats = new HashMap<ExecutorInfo,ExecutorStats>(2*_map426.size);
-                ExecutorInfo _key427;
-                ExecutorStats _val428;
-                for (int _i429 = 0; _i429 < _map426.size; ++_i429)
+                org.apache.thrift.protocol.TMap _map446 = iprot.readMapBegin();
+                struct.executor_stats = new HashMap<ExecutorInfo,ExecutorStats>(2*_map446.size);
+                ExecutorInfo _key447;
+                ExecutorStats _val448;
+                for (int _i449 = 0; _i449 < _map446.size; ++_i449)
                 {
-                  _key427 = new ExecutorInfo();
-                  _key427.read(iprot);
-                  _val428 = new ExecutorStats();
-                  _val428.read(iprot);
-                  struct.executor_stats.put(_key427, _val428);
+                  _key447 = new ExecutorInfo();
+                  _key447.read(iprot);
+                  _val448 = new ExecutorStats();
+                  _val448.read(iprot);
+                  struct.executor_stats.put(_key447, _val448);
                 }
                 iprot.readMapEnd();
               }
@@ -693,10 +692,10 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
         oprot.writeFieldBegin(EXECUTOR_STATS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.executor_stats.size()));
-          for (Map.Entry<ExecutorInfo, ExecutorStats> _iter430 : struct.executor_stats.entrySet())
+          for (Map.Entry<ExecutorInfo, ExecutorStats> _iter450 : struct.executor_stats.entrySet())
           {
-            _iter430.getKey().write(oprot);
-            _iter430.getValue().write(oprot);
+            _iter450.getKey().write(oprot);
+            _iter450.getValue().write(oprot);
           }
           oprot.writeMapEnd();
         }
@@ -728,10 +727,10 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
       oprot.writeString(struct.storm_id);
       {
         oprot.writeI32(struct.executor_stats.size());
-        for (Map.Entry<ExecutorInfo, ExecutorStats> _iter431 : struct.executor_stats.entrySet())
+        for (Map.Entry<ExecutorInfo, ExecutorStats> _iter451 : struct.executor_stats.entrySet())
         {
-          _iter431.getKey().write(oprot);
-          _iter431.getValue().write(oprot);
+          _iter451.getKey().write(oprot);
+          _iter451.getValue().write(oprot);
         }
       }
       oprot.writeI32(struct.time_secs);
@@ -744,17 +743,17 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
       struct.storm_id = iprot.readString();
       struct.set_storm_id_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map432 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.executor_stats = new HashMap<ExecutorInfo,ExecutorStats>(2*_map432.size);
-        ExecutorInfo _key433;
-        ExecutorStats _val434;
-        for (int _i435 = 0; _i435 < _map432.size; ++_i435)
+        org.apache.thrift.protocol.TMap _map452 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.executor_stats = new HashMap<ExecutorInfo,ExecutorStats>(2*_map452.size);
+        ExecutorInfo _key453;
+        ExecutorStats _val454;
+        for (int _i455 = 0; _i455 < _map452.size; ++_i455)
         {
-          _key433 = new ExecutorInfo();
-          _key433.read(iprot);
-          _val434 = new ExecutorStats();
-          _val434.read(iprot);
-          struct.executor_stats.put(_key433, _val434);
+          _key453 = new ExecutorInfo();
+          _key453.read(iprot);
+          _val454 = new ExecutorStats();
+          _val454.read(iprot);
+          struct.executor_stats.put(_key453, _val454);
         }
       }
       struct.set_executor_stats_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/Credentials.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Credentials.java b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
index c1ef293..896d227 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Credentials.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials");
 
@@ -365,15 +365,15 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
           case 1: // CREDS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map326 = iprot.readMapBegin();
-                struct.creds = new HashMap<String,String>(2*_map326.size);
-                String _key327;
-                String _val328;
-                for (int _i329 = 0; _i329 < _map326.size; ++_i329)
+                org.apache.thrift.protocol.TMap _map336 = iprot.readMapBegin();
+                struct.creds = new HashMap<String,String>(2*_map336.size);
+                String _key337;
+                String _val338;
+                for (int _i339 = 0; _i339 < _map336.size; ++_i339)
                 {
-                  _key327 = iprot.readString();
-                  _val328 = iprot.readString();
-                  struct.creds.put(_key327, _val328);
+                  _key337 = iprot.readString();
+                  _val338 = iprot.readString();
+                  struct.creds.put(_key337, _val338);
                 }
                 iprot.readMapEnd();
               }
@@ -399,10 +399,10 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
         oprot.writeFieldBegin(CREDS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.creds.size()));
-          for (Map.Entry<String, String> _iter330 : struct.creds.entrySet())
+          for (Map.Entry<String, String> _iter340 : struct.creds.entrySet())
           {
-            oprot.writeString(_iter330.getKey());
-            oprot.writeString(_iter330.getValue());
+            oprot.writeString(_iter340.getKey());
+            oprot.writeString(_iter340.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -427,10 +427,10 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
       TTupleProtocol oprot = (TTupleProtocol) prot;
       {
         oprot.writeI32(struct.creds.size());
-        for (Map.Entry<String, String> _iter331 : struct.creds.entrySet())
+        for (Map.Entry<String, String> _iter341 : struct.creds.entrySet())
         {
-          oprot.writeString(_iter331.getKey());
-          oprot.writeString(_iter331.getValue());
+          oprot.writeString(_iter341.getKey());
+          oprot.writeString(_iter341.getValue());
         }
       }
     }
@@ -439,15 +439,15 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
     public void read(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
       {
-        org.apache.thrift.protocol.TMap _map332 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-        struct.creds = new HashMap<String,String>(2*_map332.size);
-        String _key333;
-        String _val334;
-        for (int _i335 = 0; _i335 < _map332.size; ++_i335)
+        org.apache.thrift.protocol.TMap _map342 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+        struct.creds = new HashMap<String,String>(2*_map342.size);
+        String _key343;
+        String _val344;
+        for (int _i345 = 0; _i345 < _map342.size; ++_i345)
         {
-          _key333 = iprot.readString();
-          _val334 = iprot.readString();
-          struct.creds.put(_key333, _val334);
+          _key343 = iprot.readString();
+          _val344 = iprot.readString();
+          struct.creds.put(_key343, _val344);
         }
       }
       struct.set_creds_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java b/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
index 1d97dca..be950cb 100644
--- a/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWorkers, LSApprovedWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<LSApprovedWorkers> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSApprovedWorkers");
 
@@ -365,15 +365,15 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
           case 1: // APPROVED_WORKERS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map454 = iprot.readMapBegin();
-                struct.approved_workers = new HashMap<String,Integer>(2*_map454.size);
-                String _key455;
-                int _val456;
-                for (int _i457 = 0; _i457 < _map454.size; ++_i457)
+                org.apache.thrift.protocol.TMap _map474 = iprot.readMapBegin();
+                struct.approved_workers = new HashMap<String,Integer>(2*_map474.size);
+                String _key475;
+                int _val476;
+                for (int _i477 = 0; _i477 < _map474.size; ++_i477)
                 {
-                  _key455 = iprot.readString();
-                  _val456 = iprot.readI32();
-                  struct.approved_workers.put(_key455, _val456);
+                  _key475 = iprot.readString();
+                  _val476 = iprot.readI32();
+                  struct.approved_workers.put(_key475, _val476);
                 }
                 iprot.readMapEnd();
               }
@@ -399,10 +399,10 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
         oprot.writeFieldBegin(APPROVED_WORKERS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.approved_workers.size()));
-          for (Map.Entry<String, Integer> _iter458 : struct.approved_workers.entrySet())
+          for (Map.Entry<String, Integer> _iter478 : struct.approved_workers.entrySet())
           {
-            oprot.writeString(_iter458.getKey());
-            oprot.writeI32(_iter458.getValue());
+            oprot.writeString(_iter478.getKey());
+            oprot.writeI32(_iter478.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -427,10 +427,10 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
       TTupleProtocol oprot = (TTupleProtocol) prot;
       {
         oprot.writeI32(struct.approved_workers.size());
-        for (Map.Entry<String, Integer> _iter459 : struct.approved_workers.entrySet())
+        for (Map.Entry<String, Integer> _iter479 : struct.approved_workers.entrySet())
         {
-          oprot.writeString(_iter459.getKey());
-          oprot.writeI32(_iter459.getValue());
+          oprot.writeString(_iter479.getKey());
+          oprot.writeI32(_iter479.getValue());
         }
       }
     }
@@ -439,15 +439,15 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
     public void read(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
       {
-        org.apache.thrift.protocol.TMap _map460 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
-        struct.approved_workers = new HashMap<String,Integer>(2*_map460.size);
-        String _key461;
-        int _val462;
-        for (int _i463 = 0; _i463 < _map460.size; ++_i463)
+        org.apache.thrift.protocol.TMap _map480 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+        struct.approved_workers = new HashMap<String,Integer>(2*_map480.size);
+        String _key481;
+        int _val482;
+        for (int _i483 = 0; _i483 < _map480.size; ++_i483)
         {
-          _key461 = iprot.readString();
-          _val462 = iprot.readI32();
-          struct.approved_workers.put(_key461, _val462);
+          _key481 = iprot.readString();
+          _val482 = iprot.readI32();
+          struct.approved_workers.put(_key481, _val482);
         }
       }
       struct.set_approved_workers_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
index 4667287..4ad9aaf 100644
--- a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSupervisorAssignments, LSSupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorAssignments> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorAssignments");
 
@@ -376,16 +376,16 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
           case 1: // ASSIGNMENTS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map464 = iprot.readMapBegin();
-                struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map464.size);
-                int _key465;
-                LocalAssignment _val466;
-                for (int _i467 = 0; _i467 < _map464.size; ++_i467)
+                org.apache.thrift.protocol.TMap _map484 = iprot.readMapBegin();
+                struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map484.size);
+                int _key485;
+                LocalAssignment _val486;
+                for (int _i487 = 0; _i487 < _map484.size; ++_i487)
                 {
-                  _key465 = iprot.readI32();
-                  _val466 = new LocalAssignment();
-                  _val466.read(iprot);
-                  struct.assignments.put(_key465, _val466);
+                  _key485 = iprot.readI32();
+                  _val486 = new LocalAssignment();
+                  _val486.read(iprot);
+                  struct.assignments.put(_key485, _val486);
                 }
                 iprot.readMapEnd();
               }
@@ -411,10 +411,10 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
         oprot.writeFieldBegin(ASSIGNMENTS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.assignments.size()));
-          for (Map.Entry<Integer, LocalAssignment> _iter468 : struct.assignments.entrySet())
+          for (Map.Entry<Integer, LocalAssignment> _iter488 : struct.assignments.entrySet())
           {
-            oprot.writeI32(_iter468.getKey());
-            _iter468.getValue().write(oprot);
+            oprot.writeI32(_iter488.getKey());
+            _iter488.getValue().write(oprot);
           }
           oprot.writeMapEnd();
         }
@@ -439,10 +439,10 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
       TTupleProtocol oprot = (TTupleProtocol) prot;
       {
         oprot.writeI32(struct.assignments.size());
-        for (Map.Entry<Integer, LocalAssignment> _iter469 : struct.assignments.entrySet())
+        for (Map.Entry<Integer, LocalAssignment> _iter489 : struct.assignments.entrySet())
         {
-          oprot.writeI32(_iter469.getKey());
-          _iter469.getValue().write(oprot);
+          oprot.writeI32(_iter489.getKey());
+          _iter489.getValue().write(oprot);
         }
       }
     }
@@ -451,16 +451,16 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
     public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
       {
-        org.apache.thrift.protocol.TMap _map470 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map470.size);
-        int _key471;
-        LocalAssignment _val472;
-        for (int _i473 = 0; _i473 < _map470.size; ++_i473)
+        org.apache.thrift.protocol.TMap _map490 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map490.size);
+        int _key491;
+        LocalAssignment _val492;
+        for (int _i493 = 0; _i493 < _map490.size; ++_i493)
         {
-          _key471 = iprot.readI32();
-          _val472 = new LocalAssignment();
-          _val472.read(iprot);
-          struct.assignments.put(_key471, _val472);
+          _key491 = iprot.readI32();
+          _val492 = new LocalAssignment();
+          _val492.read(iprot);
+          struct.assignments.put(_key491, _val492);
         }
       }
       struct.set_assignments_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java b/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
index 80f917b..5384063 100644
--- a/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartbeat, LSWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<LSWorkerHeartbeat> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSWorkerHeartbeat");
 
@@ -638,14 +638,14 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
           case 3: // EXECUTORS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list474 = iprot.readListBegin();
-                struct.executors = new ArrayList<ExecutorInfo>(_list474.size);
-                ExecutorInfo _elem475;
-                for (int _i476 = 0; _i476 < _list474.size; ++_i476)
+                org.apache.thrift.protocol.TList _list494 = iprot.readListBegin();
+                struct.executors = new ArrayList<ExecutorInfo>(_list494.size);
+                ExecutorInfo _elem495;
+                for (int _i496 = 0; _i496 < _list494.size; ++_i496)
                 {
-                  _elem475 = new ExecutorInfo();
-                  _elem475.read(iprot);
-                  struct.executors.add(_elem475);
+                  _elem495 = new ExecutorInfo();
+                  _elem495.read(iprot);
+                  struct.executors.add(_elem495);
                 }
                 iprot.readListEnd();
               }
@@ -687,9 +687,9 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
         oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
-          for (ExecutorInfo _iter477 : struct.executors)
+          for (ExecutorInfo _iter497 : struct.executors)
           {
-            _iter477.write(oprot);
+            _iter497.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -719,9 +719,9 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
       oprot.writeString(struct.topology_id);
       {
         oprot.writeI32(struct.executors.size());
-        for (ExecutorInfo _iter478 : struct.executors)
+        for (ExecutorInfo _iter498 : struct.executors)
         {
-          _iter478.write(oprot);
+          _iter498.write(oprot);
         }
       }
       oprot.writeI32(struct.port);
@@ -735,14 +735,14 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
       struct.topology_id = iprot.readString();
       struct.set_topology_id_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.executors = new ArrayList<ExecutorInfo>(_list479.size);
-        ExecutorInfo _elem480;
-        for (int _i481 = 0; _i481 < _list479.size; ++_i481)
+        org.apache.thrift.protocol.TList _list499 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.executors = new ArrayList<ExecutorInfo>(_list499.size);
+        ExecutorInfo _elem500;
+        for (int _i501 = 0; _i501 < _list499.size; ++_i501)
         {
-          _elem480 = new ExecutorInfo();
-          _elem480.read(iprot);
-          struct.executors.add(_elem480);
+          _elem500 = new ExecutorInfo();
+          _elem500.read(iprot);
+          struct.executors.add(_elem500);
         }
       }
       struct.set_executors_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java b/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
index 3c34891..695c2cb 100644
--- a/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment, LocalAssignment._Fields>, java.io.Serializable, Cloneable, Comparable<LocalAssignment> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalAssignment");
 
@@ -464,14 +464,14 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
           case 2: // EXECUTORS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list446 = iprot.readListBegin();
-                struct.executors = new ArrayList<ExecutorInfo>(_list446.size);
-                ExecutorInfo _elem447;
-                for (int _i448 = 0; _i448 < _list446.size; ++_i448)
+                org.apache.thrift.protocol.TList _list466 = iprot.readListBegin();
+                struct.executors = new ArrayList<ExecutorInfo>(_list466.size);
+                ExecutorInfo _elem467;
+                for (int _i468 = 0; _i468 < _list466.size; ++_i468)
                 {
-                  _elem447 = new ExecutorInfo();
-                  _elem447.read(iprot);
-                  struct.executors.add(_elem447);
+                  _elem467 = new ExecutorInfo();
+                  _elem467.read(iprot);
+                  struct.executors.add(_elem467);
                 }
                 iprot.readListEnd();
               }
@@ -502,9 +502,9 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
         oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
-          for (ExecutorInfo _iter449 : struct.executors)
+          for (ExecutorInfo _iter469 : struct.executors)
           {
-            _iter449.write(oprot);
+            _iter469.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -530,9 +530,9 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       oprot.writeString(struct.topology_id);
       {
         oprot.writeI32(struct.executors.size());
-        for (ExecutorInfo _iter450 : struct.executors)
+        for (ExecutorInfo _iter470 : struct.executors)
         {
-          _iter450.write(oprot);
+          _iter470.write(oprot);
         }
       }
     }
@@ -543,14 +543,14 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       struct.topology_id = iprot.readString();
       struct.set_topology_id_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list451 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.executors = new ArrayList<ExecutorInfo>(_list451.size);
-        ExecutorInfo _elem452;
-        for (int _i453 = 0; _i453 < _list451.size; ++_i453)
+        org.apache.thrift.protocol.TList _list471 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.executors = new ArrayList<ExecutorInfo>(_list471.size);
+        ExecutorInfo _elem472;
+        for (int _i473 = 0; _i473 < _list471.size; ++_i473)
         {
-          _elem452 = new ExecutorInfo();
-          _elem452.read(iprot);
-          struct.executors.add(_elem452);
+          _elem472 = new ExecutorInfo();
+          _elem472.read(iprot);
+          struct.executors.add(_elem472);
         }
       }
       struct.set_executors_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java b/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
index 448711d..69eb2a9 100644
--- a/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, LocalStateData._Fields>, java.io.Serializable, Cloneable, Comparable<LocalStateData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalStateData");
 
@@ -376,16 +376,16 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
           case 1: // SERIALIZED_PARTS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map436 = iprot.readMapBegin();
-                struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map436.size);
-                String _key437;
-                ThriftSerializedObject _val438;
-                for (int _i439 = 0; _i439 < _map436.size; ++_i439)
+                org.apache.thrift.protocol.TMap _map456 = iprot.readMapBegin();
+                struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map456.size);
+                String _key457;
+                ThriftSerializedObject _val458;
+                for (int _i459 = 0; _i459 < _map456.size; ++_i459)
                 {
-                  _key437 = iprot.readString();
-                  _val438 = new ThriftSerializedObject();
-                  _val438.read(iprot);
-                  struct.serialized_parts.put(_key437, _val438);
+                  _key457 = iprot.readString();
+                  _val458 = new ThriftSerializedObject();
+                  _val458.read(iprot);
+                  struct.serialized_parts.put(_key457, _val458);
                 }
                 iprot.readMapEnd();
               }
@@ -411,10 +411,10 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
         oprot.writeFieldBegin(SERIALIZED_PARTS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.serialized_parts.size()));
-          for (Map.Entry<String, ThriftSerializedObject> _iter440 : struct.serialized_parts.entrySet())
+          for (Map.Entry<String, ThriftSerializedObject> _iter460 : struct.serialized_parts.entrySet())
           {
-            oprot.writeString(_iter440.getKey());
-            _iter440.getValue().write(oprot);
+            oprot.writeString(_iter460.getKey());
+            _iter460.getValue().write(oprot);
           }
           oprot.writeMapEnd();
         }
@@ -439,10 +439,10 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
       TTupleProtocol oprot = (TTupleProtocol) prot;
       {
         oprot.writeI32(struct.serialized_parts.size());
-        for (Map.Entry<String, ThriftSerializedObject> _iter441 : struct.serialized_parts.entrySet())
+        for (Map.Entry<String, ThriftSerializedObject> _iter461 : struct.serialized_parts.entrySet())
         {
-          oprot.writeString(_iter441.getKey());
-          _iter441.getValue().write(oprot);
+          oprot.writeString(_iter461.getKey());
+          _iter461.getValue().write(oprot);
         }
       }
     }
@@ -451,16 +451,16 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
     public void read(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
       {
-        org.apache.thrift.protocol.TMap _map442 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map442.size);
-        String _key443;
-        ThriftSerializedObject _val444;
-        for (int _i445 = 0; _i445 < _map442.size; ++_i445)
+        org.apache.thrift.protocol.TMap _map462 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map462.size);
+        String _key463;
+        ThriftSerializedObject _val464;
+        for (int _i465 = 0; _i465 < _map462.size; ++_i465)
         {
-          _key443 = iprot.readString();
-          _val444 = new ThriftSerializedObject();
-          _val444.read(iprot);
-          struct.serialized_parts.put(_key443, _val444);
+          _key463 = iprot.readString();
+          _val464 = new ThriftSerializedObject();
+          _val464.read(iprot);
+          struct.serialized_parts.put(_key463, _val464);
         }
       }
       struct.set_serialized_parts_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
index b535e69..1c2b2f0 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class Nimbus {
 
   public interface Iface {
@@ -70,7 +70,7 @@ public class Nimbus {
 
     public void rebalance(String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException;
 
-    public void debug(String name, boolean enable) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public void debug(String name, String component, boolean enable) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
 
     public void uploadNewCredentials(String name, Credentials creds) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException;
 
@@ -126,7 +126,7 @@ public class Nimbus {
 
     public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void debug(String name, boolean enable, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void debug(String name, String component, boolean enable, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void uploadNewCredentials(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
@@ -376,16 +376,17 @@ public class Nimbus {
       return;
     }
 
-    public void debug(String name, boolean enable) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void debug(String name, String component, boolean enable) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
     {
-      send_debug(name, enable);
+      send_debug(name, component, enable);
       recv_debug();
     }
 
-    public void send_debug(String name, boolean enable) throws org.apache.thrift.TException
+    public void send_debug(String name, String component, boolean enable) throws org.apache.thrift.TException
     {
       debug_args args = new debug_args();
       args.set_name(name);
+      args.set_component(component);
       args.set_enable(enable);
       sendBase("debug", args);
     }
@@ -1022,19 +1023,21 @@ public class Nimbus {
       }
     }
 
-    public void debug(String name, boolean enable, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void debug(String name, String component, boolean enable, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      debug_call method_call = new debug_call(name, enable, resultHandler, this, ___protocolFactory, ___transport);
+      debug_call method_call = new debug_call(name, component, enable, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class debug_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String name;
+      private String component;
       private boolean enable;
-      public debug_call(String name, boolean enable, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public debug_call(String name, String component, boolean enable, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.name = name;
+        this.component = component;
         this.enable = enable;
       }
 
@@ -1042,6 +1045,7 @@ public class Nimbus {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("debug", org.apache.thrift.protocol.TMessageType.CALL, 0));
         debug_args args = new debug_args();
         args.set_name(name);
+        args.set_component(component);
         args.set_enable(enable);
         args.write(prot);
         prot.writeMessageEnd();
@@ -1714,7 +1718,7 @@ public class Nimbus {
       public debug_result getResult(I iface, debug_args args) throws org.apache.thrift.TException {
         debug_result result = new debug_result();
         try {
-          iface.debug(args.name, args.enable);
+          iface.debug(args.name, args.component, args.enable);
         } catch (NotAliveException e) {
           result.e = e;
         } catch (AuthorizationException aze) {
@@ -2586,7 +2590,7 @@ public class Nimbus {
       }
 
       public void start(I iface, debug_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
-        iface.debug(args.name, args.enable,resultHandler);
+        iface.debug(args.name, args.component, args.enable,resultHandler);
       }
     }
 
@@ -10416,7 +10420,8 @@ public class Nimbus {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("debug_args");
 
     private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField ENABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("enable", org.apache.thrift.protocol.TType.BOOL, (short)2);
+    private static final org.apache.thrift.protocol.TField COMPONENT_FIELD_DESC = new org.apache.thrift.protocol.TField("component", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField ENABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("enable", org.apache.thrift.protocol.TType.BOOL, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -10425,12 +10430,14 @@ public class Nimbus {
     }
 
     private String name; // required
+    private String component; // required
     private boolean enable; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       NAME((short)1, "name"),
-      ENABLE((short)2, "enable");
+      COMPONENT((short)2, "component"),
+      ENABLE((short)3, "enable");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -10447,7 +10454,9 @@ public class Nimbus {
         switch(fieldId) {
           case 1: // NAME
             return NAME;
-          case 2: // ENABLE
+          case 2: // COMPONENT
+            return COMPONENT;
+          case 3: // ENABLE
             return ENABLE;
           default:
             return null;
@@ -10496,6 +10505,8 @@ public class Nimbus {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.COMPONENT, new org.apache.thrift.meta_data.FieldMetaData("component", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.ENABLE, new org.apache.thrift.meta_data.FieldMetaData("enable", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -10507,10 +10518,12 @@ public class Nimbus {
 
     public debug_args(
       String name,
+      String component,
       boolean enable)
     {
       this();
       this.name = name;
+      this.component = component;
       this.enable = enable;
       set_enable_isSet(true);
     }
@@ -10523,6 +10536,9 @@ public class Nimbus {
       if (other.is_set_name()) {
         this.name = other.name;
       }
+      if (other.is_set_component()) {
+        this.component = other.component;
+      }
       this.enable = other.enable;
     }
 
@@ -10533,6 +10549,7 @@ public class Nimbus {
     @Override
     public void clear() {
       this.name = null;
+      this.component = null;
       set_enable_isSet(false);
       this.enable = false;
     }
@@ -10560,6 +10577,29 @@ public class Nimbus {
       }
     }
 
+    public String get_component() {
+      return this.component;
+    }
+
+    public void set_component(String component) {
+      this.component = component;
+    }
+
+    public void unset_component() {
+      this.component = null;
+    }
+
+    /** Returns true if field component is set (has been assigned a value) and false otherwise */
+    public boolean is_set_component() {
+      return this.component != null;
+    }
+
+    public void set_component_isSet(boolean value) {
+      if (!value) {
+        this.component = null;
+      }
+    }
+
     public boolean is_enable() {
       return this.enable;
     }
@@ -10592,6 +10632,14 @@ public class Nimbus {
         }
         break;
 
+      case COMPONENT:
+        if (value == null) {
+          unset_component();
+        } else {
+          set_component((String)value);
+        }
+        break;
+
       case ENABLE:
         if (value == null) {
           unset_enable();
@@ -10608,6 +10656,9 @@ public class Nimbus {
       case NAME:
         return get_name();
 
+      case COMPONENT:
+        return get_component();
+
       case ENABLE:
         return Boolean.valueOf(is_enable());
 
@@ -10624,6 +10675,8 @@ public class Nimbus {
       switch (field) {
       case NAME:
         return is_set_name();
+      case COMPONENT:
+        return is_set_component();
       case ENABLE:
         return is_set_enable();
       }
@@ -10652,6 +10705,15 @@ public class Nimbus {
           return false;
       }
 
+      boolean this_present_component = true && this.is_set_component();
+      boolean that_present_component = true && that.is_set_component();
+      if (this_present_component || that_present_component) {
+        if (!(this_present_component && that_present_component))
+          return false;
+        if (!this.component.equals(that.component))
+          return false;
+      }
+
       boolean this_present_enable = true;
       boolean that_present_enable = true;
       if (this_present_enable || that_present_enable) {
@@ -10673,6 +10735,11 @@ public class Nimbus {
       if (present_name)
         list.add(name);
 
+      boolean present_component = true && (is_set_component());
+      list.add(present_component);
+      if (present_component)
+        list.add(component);
+
       boolean present_enable = true;
       list.add(present_enable);
       if (present_enable)
@@ -10699,6 +10766,16 @@ public class Nimbus {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(is_set_component()).compareTo(other.is_set_component());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (is_set_component()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component, other.component);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = Boolean.valueOf(is_set_enable()).compareTo(other.is_set_enable());
       if (lastComparison != 0) {
         return lastComparison;
@@ -10737,6 +10814,14 @@ public class Nimbus {
       }
       first = false;
       if (!first) sb.append(", ");
+      sb.append("component:");
+      if (this.component == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.component);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("enable:");
       sb.append(this.enable);
       first = false;
@@ -10793,7 +10878,15 @@ public class Nimbus {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // ENABLE
+            case 2: // COMPONENT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.component = iprot.readString();
+                struct.set_component_isSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ENABLE
               if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
                 struct.enable = iprot.readBool();
                 struct.set_enable_isSet(true);
@@ -10819,6 +10912,11 @@ public class Nimbus {
           oprot.writeString(struct.name);
           oprot.writeFieldEnd();
         }
+        if (struct.component != null) {
+          oprot.writeFieldBegin(COMPONENT_FIELD_DESC);
+          oprot.writeString(struct.component);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldBegin(ENABLE_FIELD_DESC);
         oprot.writeBool(struct.enable);
         oprot.writeFieldEnd();
@@ -10843,13 +10941,19 @@ public class Nimbus {
         if (struct.is_set_name()) {
           optionals.set(0);
         }
-        if (struct.is_set_enable()) {
+        if (struct.is_set_component()) {
           optionals.set(1);
         }
-        oprot.writeBitSet(optionals, 2);
+        if (struct.is_set_enable()) {
+          optionals.set(2);
+        }
+        oprot.writeBitSet(optionals, 3);
         if (struct.is_set_name()) {
           oprot.writeString(struct.name);
         }
+        if (struct.is_set_component()) {
+          oprot.writeString(struct.component);
+        }
         if (struct.is_set_enable()) {
           oprot.writeBool(struct.enable);
         }
@@ -10858,12 +10962,16 @@ public class Nimbus {
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, debug_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.name = iprot.readString();
           struct.set_name_isSet(true);
         }
         if (incoming.get(1)) {
+          struct.component = iprot.readString();
+          struct.set_component_isSet(true);
+        }
+        if (incoming.get(2)) {
           struct.enable = iprot.readBool();
           struct.set_enable_isSet(true);
         }

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
index a71d1b4..f844023 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-5")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<NodeInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeInfo");
 
@@ -461,13 +461,13 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
           case 2: // PORT
             if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
               {
-                org.apache.thrift.protocol.TSet _set362 = iprot.readSetBegin();
-                struct.port = new HashSet<Long>(2*_set362.size);
-                long _elem363;
-                for (int _i364 = 0; _i364 < _set362.size; ++_i364)
+                org.apache.thrift.protocol.TSet _set372 = iprot.readSetBegin();
+                struct.port = new HashSet<Long>(2*_set372.size);
+                long _elem373;
+                for (int _i374 = 0; _i374 < _set372.size; ++_i374)
                 {
-                  _elem363 = iprot.readI64();
-                  struct.port.add(_elem363);
+                  _elem373 = iprot.readI64();
+                  struct.port.add(_elem373);
                 }
                 iprot.readSetEnd();
               }
@@ -498,9 +498,9 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
         oprot.writeFieldBegin(PORT_FIELD_DESC);
         {
           oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.port.size()));
-          for (long _iter365 : struct.port)
+          for (long _iter375 : struct.port)
           {
-            oprot.writeI64(_iter365);
+            oprot.writeI64(_iter375);
           }
           oprot.writeSetEnd();
         }
@@ -526,9 +526,9 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
       oprot.writeString(struct.node);
       {
         oprot.writeI32(struct.port.size());
-        for (long _iter366 : struct.port)
+        for (long _iter376 : struct.port)
         {
-          oprot.writeI64(_iter366);
+          oprot.writeI64(_iter376);
         }
       }
     }
@@ -539,13 +539,13 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
       struct.node = iprot.readString();
       struct.set_node_isSet(true);
       {
-        org.apache.thrift.protocol.TSet _set367 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
-        struct.port = new HashSet<Long>(2*_set367.size);
-        long _elem368;
-        for (int _i369 = 0; _i369 < _set367.size; ++_i369)
+        org.apache.thrift.protocol.TSet _set377 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+        struct.port = new HashSet<Long>(2*_set377.size);
+        long _elem378;
+        for (int _i379 = 0; _i379 < _set377.size; ++_i379)
         {
-          _elem368 = iprot.readI64();
-          struct.port.add(_elem368);
+          _elem378 = iprot.readI64();
+          struct.port.add(_elem378);
         }
       }
       struct.set_port_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/306ec57d/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
index f973ffc..98d035a 100644
--- a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
 public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable, Comparable<RebalanceOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions");
 
@@ -529,15 +529,15 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
           case 3: // NUM_EXECUTORS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map316 = iprot.readMapBegin();
-                struct.num_executors = new HashMap<String,Integer>(2*_map316.size);
-                String _key317;
-                int _val318;
-                for (int _i319 = 0; _i319 < _map316.size; ++_i319)
+                org.apache.thrift.protocol.TMap _map326 = iprot.readMapBegin();
+                struct.num_executors = new HashMap<String,Integer>(2*_map326.size);
+                String _key327;
+                int _val328;
+                for (int _i329 = 0; _i329 < _map326.size; ++_i329)
                 {
-                  _key317 = iprot.readString();
-                  _val318 = iprot.readI32();
-                  struct.num_executors.put(_key317, _val318);
+                  _key327 = iprot.readString();
+                  _val328 = iprot.readI32();
+                  struct.num_executors.put(_key327, _val328);
                 }
                 iprot.readMapEnd();
               }
@@ -574,10 +574,10 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
           oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.num_executors.size()));
-            for (Map.Entry<String, Integer> _iter320 : struct.num_executors.entrySet())
+            for (Map.Entry<String, Integer> _iter330 : struct.num_executors.entrySet())
             {
-              oprot.writeString(_iter320.getKey());
-              oprot.writeI32(_iter320.getValue());
+              oprot.writeString(_iter330.getKey());
+              oprot.writeI32(_iter330.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -621,10 +621,10 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       if (struct.is_set_num_executors()) {
         {
           oprot.writeI32(struct.num_executors.size());
-          for (Map.Entry<String, Integer> _iter321 : struct.num_executors.entrySet())
+          for (Map.Entry<String, Integer> _iter331 : struct.num_executors.entrySet())
           {
-            oprot.writeString(_iter321.getKey());
-            oprot.writeI32(_iter321.getValue());
+            oprot.writeString(_iter331.getKey());
+            oprot.writeI32(_iter331.getValue());
           }
         }
       }
@@ -644,15 +644,15 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map322 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.num_executors = new HashMap<String,Integer>(2*_map322.size);
-          String _key323;
-          int _val324;
-          for (int _i325 = 0; _i325 < _map322.size; ++_i325)
+          org.apache.thrift.protocol.TMap _map332 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.num_executors = new HashMap<String,Integer>(2*_map332.size);
+          String _key333;
+          int _val334;
+          for (int _i335 = 0; _i335 < _map332.size; ++_i335)
           {
-            _key323 = iprot.readString();
-            _val324 = iprot.readI32();
-            struct.num_executors.put(_key323, _val324);
+            _key333 = iprot.readString();
+            _val334 = iprot.readI32();
+            struct.num_executors.put(_key333, _val334);
           }
         }
         struct.set_num_executors_isSet(true);