diff --git a/storm-core/src/clj/backtype/storm/converter.clj b/storm-core/src/clj/backtype/storm/converter.clj index 63868cdb54d..9298321f38b 100644 --- a/storm-core/src/clj/backtype/storm/converter.clj +++ b/storm-core/src/clj/backtype/storm/converter.clj @@ -29,6 +29,7 @@ (.set_scheduler_meta (:scheduler-meta supervisor-info)) (.set_uptime_secs (long (:uptime-secs supervisor-info))) (.set_version (:version supervisor-info)) + (.set_system_stats (:system-stats supervisor-info)) )) (defn clojurify-supervisor-info [^SupervisorInfo supervisor-info] @@ -41,7 +42,8 @@ (if (.get_meta supervisor-info) (into [] (.get_meta supervisor-info))) (if (.get_scheduler_meta supervisor-info) (into {} (.get_scheduler_meta supervisor-info))) (.get_uptime_secs supervisor-info) - (.get_version supervisor-info)))) + (.get_version supervisor-info) + (if-let [system_stats (.get_system_stats supervisor-info)] (into {} system_stats))))) (defn thriftify-assignment [assignment] (doto (Assignment.) @@ -185,6 +187,7 @@ :executor-stats (clojurify-stats (into {} (.get_executor_stats worker-hb))) :uptime (.get_uptime_secs worker-hb) :time-secs (.get_time_secs worker-hb) + :system-stats (.get_system_stats worker-hb) } {})) @@ -194,7 +197,8 @@ (.set_uptime_secs (:uptime worker-hb)) (.set_storm_id (:storm-id worker-hb)) (.set_executor_stats (thriftify-stats (filter second (:executor-stats worker-hb)))) - (.set_time_secs (:time-secs worker-hb))))) + (.set_time_secs (:time-secs worker-hb)) + (.set_system_stats (:system-stats worker-hb))))) (defn clojurify-error [^ErrorInfo error] (if error diff --git a/storm-core/src/clj/backtype/storm/daemon/common.clj b/storm-core/src/clj/backtype/storm/daemon/common.clj index e3a10ef311b..22bb04cadba 100644 --- a/storm-core/src/clj/backtype/storm/daemon/common.clj +++ b/storm-core/src/clj/backtype/storm/daemon/common.clj @@ -53,7 +53,7 @@ ;; component->executors is a map from spout/bolt id to number of executors for that component (defrecord StormBase [storm-name launch-time-secs status num-workers component->executors owner topology-action-options prev-status]) -(defrecord SupervisorInfo [time-secs hostname assignment-id used-ports meta scheduler-meta uptime-secs version]) +(defrecord SupervisorInfo [time-secs hostname assignment-id used-ports meta scheduler-meta uptime-secs version system-stats]) (defprotocol DaemonCommon (waiting? [this])) diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj index 40216e832bd..cc41e690abf 100644 --- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj @@ -1260,6 +1260,7 @@ (count (:used-ports info)) id) ] (when-let [version (:version info)] (.set_version sup-sum version)) + (when-let [system-stats (:system-stats info)] (.set_system_stats sup-sum system-stats)) sup-sum )) nimbus-uptime ((:uptime nimbus)) diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj index 41533df16c8..43a87bd1710 100644 --- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj @@ -295,6 +295,7 @@ (Utils/isZkAuthenticationConfiguredStormServer conf) SUPERVISOR-ZK-ACLS)) + :system-stats-fn (mk-system-stats-fn) :local-state (supervisor-state conf) :supervisor-id (.getSupervisorId isupervisor) :assignment-id (.getAssignmentId isupervisor) @@ -511,7 +512,8 @@ (.getMetadata isupervisor) (conf SUPERVISOR-SCHEDULER-META) ((:uptime supervisor)) - (:version supervisor))))] + (:version supervisor) + ((:system-stats-fn supervisor)))))] (heartbeat-fn) ;; should synchronize supervisor so it doesn't launch anything after being down (optimization) diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj index 7157cf77ebf..e0512cf4cd3 100644 --- a/storm-core/src/clj/backtype/storm/daemon/worker.clj +++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj @@ -34,6 +34,8 @@ (:import [backtype.storm.security.auth AuthUtils]) (:import [javax.security.auth Subject]) (:import [java.security PrivilegedExceptionAction]) + (:use [backtype.storm.util]) + (:gen-class)) (defmulti mk-suicide-fn cluster-mode) @@ -61,6 +63,7 @@ :executor-stats stats :uptime ((:uptime worker)) :time-secs (current-time-secs) + :system-stats ((:system-stats-fn worker)) }] ;; do the zookeeper heartbeat (.worker-heartbeat! (:storm-cluster-state worker) (:storm-id worker) (:assignment-id worker) (:port worker) zk-hb) @@ -253,6 +256,7 @@ :receiver-thread-count (get storm-conf WORKER-RECEIVER-THREAD-COUNT) :transfer-fn (mk-transfer-fn <>) :assignment-versions assignment-versions + :system-stats-fn (mk-system-stats-fn) ))) (defn- endpoint->string [[node port]] diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj index 3fd9f2a8049..a63ec193d92 100644 --- a/storm-core/src/clj/backtype/storm/util.clj +++ b/storm-core/src/clj/backtype/storm/util.clj @@ -385,6 +385,21 @@ (throw (RuntimeException. (str "Got unexpected process name: " name)))) (first split))) +(defn memory-bean + "Return MemoryMXBean" + [] + (ManagementFactory/getMemoryMXBean)) + +(defn heap-usage + "Return the heap usage of the given MemoryMXBean" + [bean] + (.getHeapMemoryUsage bean)) + +(defn non-heap-usage + "Return the non heap usage of the given MemoryMXBean" + [bean] + (.getNonHeapMemoryUsage bean)) + (defn exec-command! [command] (let [[comm-str & args] (seq (.split command " ")) command (CommandLine. comm-str)] @@ -1065,3 +1080,19 @@ (assoc coll k (apply str (repeat (count (coll k)) "#"))) coll)) +(defn mk-system-stats-fn + "Returns a function that retuns the system stats (memory in Bytes & CPU util) of the JVM process" + [] + (let [memory-bean (memory-bean)] + (fn [] { + "heap_initBytes" (double (.getInit (heap-usage memory-bean))) + "heap_usedBytes" (double (.getUsed (heap-usage memory-bean))) + "heap_committedBytes" (double (.getCommitted (heap-usage memory-bean))) + "heap_maxBytes" (double (.getMax (heap-usage memory-bean))) + "nonHeap_initBytes" (double (.getInit (non-heap-usage memory-bean))) + "nonHeap_usedBytes" (double (.getUsed (non-heap-usage memory-bean))) + "nonHeap_committedBytes" (double (.getCommitted (non-heap-usage memory-bean))) + "nonHeap_maxBytes" (double (.getMax (non-heap-usage memory-bean))) + "cpuUtil" (Utils/getCpuUtil) + }))) + diff --git a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java index 62647c31be1..292ba288bc5 100644 --- a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java +++ b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java @@ -51,7 +51,7 @@ 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-7-1") public class AlreadyAliveException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyAliveException"); diff --git a/storm-core/src/jvm/backtype/storm/generated/Assignment.java b/storm-core/src/jvm/backtype/storm/generated/Assignment.java index 2e6e8a33e7b..0b4ab256aac 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.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-7-1") public class Assignment implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Assignment"); @@ -678,15 +678,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Assignment struct) 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(2*_map370.size); - String _key371; - String _val372; - for (int _i373 = 0; _i373 < _map370.size; ++_i373) + org.apache.thrift.protocol.TMap _map390 = iprot.readMapBegin(); + struct.node_host = new HashMap(2*_map390.size); + String _key391; + String _val392; + for (int _i393 = 0; _i393 < _map390.size; ++_i393) { - _key371 = iprot.readString(); - _val372 = iprot.readString(); - struct.node_host.put(_key371, _val372); + _key391 = iprot.readString(); + _val392 = iprot.readString(); + struct.node_host.put(_key391, _val392); } iprot.readMapEnd(); } @@ -698,26 +698,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Assignment struct) 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,NodeInfo>(2*_map374.size); - List _key375; - NodeInfo _val376; - for (int _i377 = 0; _i377 < _map374.size; ++_i377) + org.apache.thrift.protocol.TMap _map394 = iprot.readMapBegin(); + struct.executor_node_port = new HashMap,NodeInfo>(2*_map394.size); + List _key395; + NodeInfo _val396; + for (int _i397 = 0; _i397 < _map394.size; ++_i397) { { - org.apache.thrift.protocol.TList _list378 = iprot.readListBegin(); - _key375 = new ArrayList(_list378.size); - long _elem379; - for (int _i380 = 0; _i380 < _list378.size; ++_i380) + org.apache.thrift.protocol.TList _list398 = iprot.readListBegin(); + _key395 = new ArrayList(_list398.size); + long _elem399; + for (int _i400 = 0; _i400 < _list398.size; ++_i400) { - _elem379 = iprot.readI64(); - _key375.add(_elem379); + _elem399 = iprot.readI64(); + _key395.add(_elem399); } iprot.readListEnd(); } - _val376 = new NodeInfo(); - _val376.read(iprot); - struct.executor_node_port.put(_key375, _val376); + _val396 = new NodeInfo(); + _val396.read(iprot); + struct.executor_node_port.put(_key395, _val396); } iprot.readMapEnd(); } @@ -729,25 +729,25 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Assignment struct) 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,Long>(2*_map381.size); - List _key382; - long _val383; - for (int _i384 = 0; _i384 < _map381.size; ++_i384) + org.apache.thrift.protocol.TMap _map401 = iprot.readMapBegin(); + struct.executor_start_time_secs = new HashMap,Long>(2*_map401.size); + List _key402; + long _val403; + for (int _i404 = 0; _i404 < _map401.size; ++_i404) { { - org.apache.thrift.protocol.TList _list385 = iprot.readListBegin(); - _key382 = new ArrayList(_list385.size); - long _elem386; - for (int _i387 = 0; _i387 < _list385.size; ++_i387) + org.apache.thrift.protocol.TList _list405 = iprot.readListBegin(); + _key402 = new ArrayList(_list405.size); + long _elem406; + for (int _i407 = 0; _i407 < _list405.size; ++_i407) { - _elem386 = iprot.readI64(); - _key382.add(_elem386); + _elem406 = iprot.readI64(); + _key402.add(_elem406); } iprot.readListEnd(); } - _val383 = iprot.readI64(); - struct.executor_start_time_secs.put(_key382, _val383); + _val403 = iprot.readI64(); + struct.executor_start_time_secs.put(_key402, _val403); } iprot.readMapEnd(); } @@ -779,10 +779,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Assignment struct) 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 _iter388 : struct.node_host.entrySet()) + for (Map.Entry _iter408 : struct.node_host.entrySet()) { - oprot.writeString(_iter388.getKey()); - oprot.writeString(_iter388.getValue()); + oprot.writeString(_iter408.getKey()); + oprot.writeString(_iter408.getValue()); } oprot.writeMapEnd(); } @@ -794,17 +794,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Assignment struct) 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, NodeInfo> _iter389 : struct.executor_node_port.entrySet()) + for (Map.Entry, NodeInfo> _iter409 : 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, _iter409.getKey().size())); + for (long _iter410 : _iter409.getKey()) { - oprot.writeI64(_iter390); + oprot.writeI64(_iter410); } oprot.writeListEnd(); } - _iter389.getValue().write(oprot); + _iter409.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -816,17 +816,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Assignment struct) 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, Long> _iter391 : struct.executor_start_time_secs.entrySet()) + for (Map.Entry, Long> _iter411 : 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, _iter411.getKey().size())); + for (long _iter412 : _iter411.getKey()) { - oprot.writeI64(_iter392); + oprot.writeI64(_iter412); } oprot.writeListEnd(); } - oprot.writeI64(_iter391.getValue()); + oprot.writeI64(_iter411.getValue()); } oprot.writeMapEnd(); } @@ -865,42 +865,42 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Assignment struct) if (struct.is_set_node_host()) { { oprot.writeI32(struct.node_host.size()); - for (Map.Entry _iter393 : struct.node_host.entrySet()) + for (Map.Entry _iter413 : struct.node_host.entrySet()) { - oprot.writeString(_iter393.getKey()); - oprot.writeString(_iter393.getValue()); + oprot.writeString(_iter413.getKey()); + oprot.writeString(_iter413.getValue()); } } } if (struct.is_set_executor_node_port()) { { oprot.writeI32(struct.executor_node_port.size()); - for (Map.Entry, NodeInfo> _iter394 : struct.executor_node_port.entrySet()) + for (Map.Entry, NodeInfo> _iter414 : struct.executor_node_port.entrySet()) { { - oprot.writeI32(_iter394.getKey().size()); - for (long _iter395 : _iter394.getKey()) + oprot.writeI32(_iter414.getKey().size()); + for (long _iter415 : _iter414.getKey()) { - oprot.writeI64(_iter395); + oprot.writeI64(_iter415); } } - _iter394.getValue().write(oprot); + _iter414.getValue().write(oprot); } } } if (struct.is_set_executor_start_time_secs()) { { oprot.writeI32(struct.executor_start_time_secs.size()); - for (Map.Entry, Long> _iter396 : struct.executor_start_time_secs.entrySet()) + for (Map.Entry, Long> _iter416 : struct.executor_start_time_secs.entrySet()) { { - oprot.writeI32(_iter396.getKey().size()); - for (long _iter397 : _iter396.getKey()) + oprot.writeI32(_iter416.getKey().size()); + for (long _iter417 : _iter416.getKey()) { - oprot.writeI64(_iter397); + oprot.writeI64(_iter417); } } - oprot.writeI64(_iter396.getValue()); + oprot.writeI64(_iter416.getValue()); } } } @@ -914,64 +914,64 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Assignment struct) t 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(2*_map398.size); - String _key399; - String _val400; - for (int _i401 = 0; _i401 < _map398.size; ++_i401) + org.apache.thrift.protocol.TMap _map418 = 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(2*_map418.size); + String _key419; + String _val420; + for (int _i421 = 0; _i421 < _map418.size; ++_i421) { - _key399 = iprot.readString(); - _val400 = iprot.readString(); - struct.node_host.put(_key399, _val400); + _key419 = iprot.readString(); + _val420 = iprot.readString(); + struct.node_host.put(_key419, _val420); } } 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,NodeInfo>(2*_map402.size); - List _key403; - NodeInfo _val404; - for (int _i405 = 0; _i405 < _map402.size; ++_i405) + org.apache.thrift.protocol.TMap _map422 = 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,NodeInfo>(2*_map422.size); + List _key423; + NodeInfo _val424; + for (int _i425 = 0; _i425 < _map422.size; ++_i425) { { - org.apache.thrift.protocol.TList _list406 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _key403 = new ArrayList(_list406.size); - long _elem407; - for (int _i408 = 0; _i408 < _list406.size; ++_i408) + org.apache.thrift.protocol.TList _list426 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _key423 = new ArrayList(_list426.size); + long _elem427; + for (int _i428 = 0; _i428 < _list426.size; ++_i428) { - _elem407 = iprot.readI64(); - _key403.add(_elem407); + _elem427 = iprot.readI64(); + _key423.add(_elem427); } } - _val404 = new NodeInfo(); - _val404.read(iprot); - struct.executor_node_port.put(_key403, _val404); + _val424 = new NodeInfo(); + _val424.read(iprot); + struct.executor_node_port.put(_key423, _val424); } } 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,Long>(2*_map409.size); - List _key410; - long _val411; - for (int _i412 = 0; _i412 < _map409.size; ++_i412) + org.apache.thrift.protocol.TMap _map429 = 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,Long>(2*_map429.size); + List _key430; + long _val431; + for (int _i432 = 0; _i432 < _map429.size; ++_i432) { { - org.apache.thrift.protocol.TList _list413 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _key410 = new ArrayList(_list413.size); - long _elem414; - for (int _i415 = 0; _i415 < _list413.size; ++_i415) + org.apache.thrift.protocol.TList _list433 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _key430 = new ArrayList(_list433.size); + long _elem434; + for (int _i435 = 0; _i435 < _list433.size; ++_i435) { - _elem414 = iprot.readI64(); - _key410.add(_elem414); + _elem434 = iprot.readI64(); + _key430.add(_elem434); } } - _val411 = iprot.readI64(); - struct.executor_start_time_secs.put(_key410, _val411); + _val431 = iprot.readI64(); + struct.executor_start_time_secs.put(_key430, _val431); } } struct.set_executor_start_time_secs_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java index a17975113d2..ba3efdfe9a5 100644 --- a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java +++ b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java @@ -51,7 +51,7 @@ 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-7-1") public class AuthorizationException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException"); diff --git a/storm-core/src/jvm/backtype/storm/generated/Bolt.java b/storm-core/src/jvm/backtype/storm/generated/Bolt.java index 861226c4dad..654cc441703 100644 --- a/storm-core/src/jvm/backtype/storm/generated/Bolt.java +++ b/storm-core/src/jvm/backtype/storm/generated/Bolt.java @@ -51,7 +51,7 @@ 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-7-1") public class Bolt implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bolt"); diff --git a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java index 1f8a9897259..3ca0b784468 100644 --- a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java +++ b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java @@ -51,7 +51,7 @@ 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-7-1") public class BoltStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BoltStats"); @@ -881,28 +881,28 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BoltStats struct) t case 1: // ACKED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map90 = iprot.readMapBegin(); - struct.acked = new HashMap>(2*_map90.size); - String _key91; - Map _val92; - for (int _i93 = 0; _i93 < _map90.size; ++_i93) + org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin(); + struct.acked = new HashMap>(2*_map100.size); + String _key101; + Map _val102; + for (int _i103 = 0; _i103 < _map100.size; ++_i103) { - _key91 = iprot.readString(); + _key101 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map94 = iprot.readMapBegin(); - _val92 = new HashMap(2*_map94.size); - GlobalStreamId _key95; - long _val96; - for (int _i97 = 0; _i97 < _map94.size; ++_i97) + org.apache.thrift.protocol.TMap _map104 = iprot.readMapBegin(); + _val102 = new HashMap(2*_map104.size); + GlobalStreamId _key105; + long _val106; + for (int _i107 = 0; _i107 < _map104.size; ++_i107) { - _key95 = new GlobalStreamId(); - _key95.read(iprot); - _val96 = iprot.readI64(); - _val92.put(_key95, _val96); + _key105 = new GlobalStreamId(); + _key105.read(iprot); + _val106 = iprot.readI64(); + _val102.put(_key105, _val106); } iprot.readMapEnd(); } - struct.acked.put(_key91, _val92); + struct.acked.put(_key101, _val102); } iprot.readMapEnd(); } @@ -914,28 +914,28 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BoltStats struct) t case 2: // FAILED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map98 = iprot.readMapBegin(); - struct.failed = new HashMap>(2*_map98.size); - String _key99; - Map _val100; - for (int _i101 = 0; _i101 < _map98.size; ++_i101) + org.apache.thrift.protocol.TMap _map108 = iprot.readMapBegin(); + struct.failed = new HashMap>(2*_map108.size); + String _key109; + Map _val110; + for (int _i111 = 0; _i111 < _map108.size; ++_i111) { - _key99 = iprot.readString(); + _key109 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map102 = iprot.readMapBegin(); - _val100 = new HashMap(2*_map102.size); - GlobalStreamId _key103; - long _val104; - for (int _i105 = 0; _i105 < _map102.size; ++_i105) + org.apache.thrift.protocol.TMap _map112 = iprot.readMapBegin(); + _val110 = new HashMap(2*_map112.size); + GlobalStreamId _key113; + long _val114; + for (int _i115 = 0; _i115 < _map112.size; ++_i115) { - _key103 = new GlobalStreamId(); - _key103.read(iprot); - _val104 = iprot.readI64(); - _val100.put(_key103, _val104); + _key113 = new GlobalStreamId(); + _key113.read(iprot); + _val114 = iprot.readI64(); + _val110.put(_key113, _val114); } iprot.readMapEnd(); } - struct.failed.put(_key99, _val100); + struct.failed.put(_key109, _val110); } iprot.readMapEnd(); } @@ -947,28 +947,28 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BoltStats struct) t case 3: // PROCESS_MS_AVG if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map106 = iprot.readMapBegin(); - struct.process_ms_avg = new HashMap>(2*_map106.size); - String _key107; - Map _val108; - for (int _i109 = 0; _i109 < _map106.size; ++_i109) + org.apache.thrift.protocol.TMap _map116 = iprot.readMapBegin(); + struct.process_ms_avg = new HashMap>(2*_map116.size); + String _key117; + Map _val118; + for (int _i119 = 0; _i119 < _map116.size; ++_i119) { - _key107 = iprot.readString(); + _key117 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map110 = iprot.readMapBegin(); - _val108 = new HashMap(2*_map110.size); - GlobalStreamId _key111; - double _val112; - for (int _i113 = 0; _i113 < _map110.size; ++_i113) + org.apache.thrift.protocol.TMap _map120 = iprot.readMapBegin(); + _val118 = new HashMap(2*_map120.size); + GlobalStreamId _key121; + double _val122; + for (int _i123 = 0; _i123 < _map120.size; ++_i123) { - _key111 = new GlobalStreamId(); - _key111.read(iprot); - _val112 = iprot.readDouble(); - _val108.put(_key111, _val112); + _key121 = new GlobalStreamId(); + _key121.read(iprot); + _val122 = iprot.readDouble(); + _val118.put(_key121, _val122); } iprot.readMapEnd(); } - struct.process_ms_avg.put(_key107, _val108); + struct.process_ms_avg.put(_key117, _val118); } iprot.readMapEnd(); } @@ -980,28 +980,28 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BoltStats struct) t case 4: // EXECUTED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map114 = iprot.readMapBegin(); - struct.executed = new HashMap>(2*_map114.size); - String _key115; - Map _val116; - for (int _i117 = 0; _i117 < _map114.size; ++_i117) + org.apache.thrift.protocol.TMap _map124 = iprot.readMapBegin(); + struct.executed = new HashMap>(2*_map124.size); + String _key125; + Map _val126; + for (int _i127 = 0; _i127 < _map124.size; ++_i127) { - _key115 = iprot.readString(); + _key125 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map118 = iprot.readMapBegin(); - _val116 = new HashMap(2*_map118.size); - GlobalStreamId _key119; - long _val120; - for (int _i121 = 0; _i121 < _map118.size; ++_i121) + org.apache.thrift.protocol.TMap _map128 = iprot.readMapBegin(); + _val126 = new HashMap(2*_map128.size); + GlobalStreamId _key129; + long _val130; + for (int _i131 = 0; _i131 < _map128.size; ++_i131) { - _key119 = new GlobalStreamId(); - _key119.read(iprot); - _val120 = iprot.readI64(); - _val116.put(_key119, _val120); + _key129 = new GlobalStreamId(); + _key129.read(iprot); + _val130 = iprot.readI64(); + _val126.put(_key129, _val130); } iprot.readMapEnd(); } - struct.executed.put(_key115, _val116); + struct.executed.put(_key125, _val126); } iprot.readMapEnd(); } @@ -1013,28 +1013,28 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BoltStats struct) t case 5: // EXECUTE_MS_AVG if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map122 = iprot.readMapBegin(); - struct.execute_ms_avg = new HashMap>(2*_map122.size); - String _key123; - Map _val124; - for (int _i125 = 0; _i125 < _map122.size; ++_i125) + org.apache.thrift.protocol.TMap _map132 = iprot.readMapBegin(); + struct.execute_ms_avg = new HashMap>(2*_map132.size); + String _key133; + Map _val134; + for (int _i135 = 0; _i135 < _map132.size; ++_i135) { - _key123 = iprot.readString(); + _key133 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map126 = iprot.readMapBegin(); - _val124 = new HashMap(2*_map126.size); - GlobalStreamId _key127; - double _val128; - for (int _i129 = 0; _i129 < _map126.size; ++_i129) + org.apache.thrift.protocol.TMap _map136 = iprot.readMapBegin(); + _val134 = new HashMap(2*_map136.size); + GlobalStreamId _key137; + double _val138; + for (int _i139 = 0; _i139 < _map136.size; ++_i139) { - _key127 = new GlobalStreamId(); - _key127.read(iprot); - _val128 = iprot.readDouble(); - _val124.put(_key127, _val128); + _key137 = new GlobalStreamId(); + _key137.read(iprot); + _val138 = iprot.readDouble(); + _val134.put(_key137, _val138); } iprot.readMapEnd(); } - struct.execute_ms_avg.put(_key123, _val124); + struct.execute_ms_avg.put(_key133, _val134); } iprot.readMapEnd(); } @@ -1060,15 +1060,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BoltStats struct) oprot.writeFieldBegin(ACKED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.acked.size())); - for (Map.Entry> _iter130 : struct.acked.entrySet()) + for (Map.Entry> _iter140 : struct.acked.entrySet()) { - oprot.writeString(_iter130.getKey()); + oprot.writeString(_iter140.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter130.getValue().size())); - for (Map.Entry _iter131 : _iter130.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter140.getValue().size())); + for (Map.Entry _iter141 : _iter140.getValue().entrySet()) { - _iter131.getKey().write(oprot); - oprot.writeI64(_iter131.getValue()); + _iter141.getKey().write(oprot); + oprot.writeI64(_iter141.getValue()); } oprot.writeMapEnd(); } @@ -1081,15 +1081,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BoltStats struct) oprot.writeFieldBegin(FAILED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.failed.size())); - for (Map.Entry> _iter132 : struct.failed.entrySet()) + for (Map.Entry> _iter142 : struct.failed.entrySet()) { - oprot.writeString(_iter132.getKey()); + oprot.writeString(_iter142.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter132.getValue().size())); - for (Map.Entry _iter133 : _iter132.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter142.getValue().size())); + for (Map.Entry _iter143 : _iter142.getValue().entrySet()) { - _iter133.getKey().write(oprot); - oprot.writeI64(_iter133.getValue()); + _iter143.getKey().write(oprot); + oprot.writeI64(_iter143.getValue()); } oprot.writeMapEnd(); } @@ -1102,15 +1102,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BoltStats struct) oprot.writeFieldBegin(PROCESS_MS_AVG_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.process_ms_avg.size())); - for (Map.Entry> _iter134 : struct.process_ms_avg.entrySet()) + for (Map.Entry> _iter144 : struct.process_ms_avg.entrySet()) { - oprot.writeString(_iter134.getKey()); + oprot.writeString(_iter144.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter134.getValue().size())); - for (Map.Entry _iter135 : _iter134.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter144.getValue().size())); + for (Map.Entry _iter145 : _iter144.getValue().entrySet()) { - _iter135.getKey().write(oprot); - oprot.writeDouble(_iter135.getValue()); + _iter145.getKey().write(oprot); + oprot.writeDouble(_iter145.getValue()); } oprot.writeMapEnd(); } @@ -1123,15 +1123,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BoltStats struct) oprot.writeFieldBegin(EXECUTED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.executed.size())); - for (Map.Entry> _iter136 : struct.executed.entrySet()) + for (Map.Entry> _iter146 : struct.executed.entrySet()) { - oprot.writeString(_iter136.getKey()); + oprot.writeString(_iter146.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter136.getValue().size())); - for (Map.Entry _iter137 : _iter136.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter146.getValue().size())); + for (Map.Entry _iter147 : _iter146.getValue().entrySet()) { - _iter137.getKey().write(oprot); - oprot.writeI64(_iter137.getValue()); + _iter147.getKey().write(oprot); + oprot.writeI64(_iter147.getValue()); } oprot.writeMapEnd(); } @@ -1144,15 +1144,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BoltStats struct) oprot.writeFieldBegin(EXECUTE_MS_AVG_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.execute_ms_avg.size())); - for (Map.Entry> _iter138 : struct.execute_ms_avg.entrySet()) + for (Map.Entry> _iter148 : struct.execute_ms_avg.entrySet()) { - oprot.writeString(_iter138.getKey()); + oprot.writeString(_iter148.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter138.getValue().size())); - for (Map.Entry _iter139 : _iter138.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter148.getValue().size())); + for (Map.Entry _iter149 : _iter148.getValue().entrySet()) { - _iter139.getKey().write(oprot); - oprot.writeDouble(_iter139.getValue()); + _iter149.getKey().write(oprot); + oprot.writeDouble(_iter149.getValue()); } oprot.writeMapEnd(); } @@ -1180,75 +1180,75 @@ public void write(org.apache.thrift.protocol.TProtocol prot, BoltStats struct) t TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.acked.size()); - for (Map.Entry> _iter140 : struct.acked.entrySet()) + for (Map.Entry> _iter150 : struct.acked.entrySet()) { - oprot.writeString(_iter140.getKey()); + oprot.writeString(_iter150.getKey()); { - oprot.writeI32(_iter140.getValue().size()); - for (Map.Entry _iter141 : _iter140.getValue().entrySet()) + oprot.writeI32(_iter150.getValue().size()); + for (Map.Entry _iter151 : _iter150.getValue().entrySet()) { - _iter141.getKey().write(oprot); - oprot.writeI64(_iter141.getValue()); + _iter151.getKey().write(oprot); + oprot.writeI64(_iter151.getValue()); } } } } { oprot.writeI32(struct.failed.size()); - for (Map.Entry> _iter142 : struct.failed.entrySet()) + for (Map.Entry> _iter152 : struct.failed.entrySet()) { - oprot.writeString(_iter142.getKey()); + oprot.writeString(_iter152.getKey()); { - oprot.writeI32(_iter142.getValue().size()); - for (Map.Entry _iter143 : _iter142.getValue().entrySet()) + oprot.writeI32(_iter152.getValue().size()); + for (Map.Entry _iter153 : _iter152.getValue().entrySet()) { - _iter143.getKey().write(oprot); - oprot.writeI64(_iter143.getValue()); + _iter153.getKey().write(oprot); + oprot.writeI64(_iter153.getValue()); } } } } { oprot.writeI32(struct.process_ms_avg.size()); - for (Map.Entry> _iter144 : struct.process_ms_avg.entrySet()) + for (Map.Entry> _iter154 : struct.process_ms_avg.entrySet()) { - oprot.writeString(_iter144.getKey()); + oprot.writeString(_iter154.getKey()); { - oprot.writeI32(_iter144.getValue().size()); - for (Map.Entry _iter145 : _iter144.getValue().entrySet()) + oprot.writeI32(_iter154.getValue().size()); + for (Map.Entry _iter155 : _iter154.getValue().entrySet()) { - _iter145.getKey().write(oprot); - oprot.writeDouble(_iter145.getValue()); + _iter155.getKey().write(oprot); + oprot.writeDouble(_iter155.getValue()); } } } } { oprot.writeI32(struct.executed.size()); - for (Map.Entry> _iter146 : struct.executed.entrySet()) + for (Map.Entry> _iter156 : struct.executed.entrySet()) { - oprot.writeString(_iter146.getKey()); + oprot.writeString(_iter156.getKey()); { - oprot.writeI32(_iter146.getValue().size()); - for (Map.Entry _iter147 : _iter146.getValue().entrySet()) + oprot.writeI32(_iter156.getValue().size()); + for (Map.Entry _iter157 : _iter156.getValue().entrySet()) { - _iter147.getKey().write(oprot); - oprot.writeI64(_iter147.getValue()); + _iter157.getKey().write(oprot); + oprot.writeI64(_iter157.getValue()); } } } } { oprot.writeI32(struct.execute_ms_avg.size()); - for (Map.Entry> _iter148 : struct.execute_ms_avg.entrySet()) + for (Map.Entry> _iter158 : struct.execute_ms_avg.entrySet()) { - oprot.writeString(_iter148.getKey()); + oprot.writeString(_iter158.getKey()); { - oprot.writeI32(_iter148.getValue().size()); - for (Map.Entry _iter149 : _iter148.getValue().entrySet()) + oprot.writeI32(_iter158.getValue().size()); + for (Map.Entry _iter159 : _iter158.getValue().entrySet()) { - _iter149.getKey().write(oprot); - oprot.writeDouble(_iter149.getValue()); + _iter159.getKey().write(oprot); + oprot.writeDouble(_iter159.getValue()); } } } @@ -1259,127 +1259,127 @@ public void write(org.apache.thrift.protocol.TProtocol prot, BoltStats struct) t public void read(org.apache.thrift.protocol.TProtocol prot, BoltStats struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TMap _map150 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.acked = new HashMap>(2*_map150.size); - String _key151; - Map _val152; - for (int _i153 = 0; _i153 < _map150.size; ++_i153) + org.apache.thrift.protocol.TMap _map160 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.acked = new HashMap>(2*_map160.size); + String _key161; + Map _val162; + for (int _i163 = 0; _i163 < _map160.size; ++_i163) { - _key151 = iprot.readString(); + _key161 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map154 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val152 = new HashMap(2*_map154.size); - GlobalStreamId _key155; - long _val156; - for (int _i157 = 0; _i157 < _map154.size; ++_i157) + org.apache.thrift.protocol.TMap _map164 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val162 = new HashMap(2*_map164.size); + GlobalStreamId _key165; + long _val166; + for (int _i167 = 0; _i167 < _map164.size; ++_i167) { - _key155 = new GlobalStreamId(); - _key155.read(iprot); - _val156 = iprot.readI64(); - _val152.put(_key155, _val156); + _key165 = new GlobalStreamId(); + _key165.read(iprot); + _val166 = iprot.readI64(); + _val162.put(_key165, _val166); } } - struct.acked.put(_key151, _val152); + struct.acked.put(_key161, _val162); } } struct.set_acked_isSet(true); { - org.apache.thrift.protocol.TMap _map158 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.failed = new HashMap>(2*_map158.size); - String _key159; - Map _val160; - for (int _i161 = 0; _i161 < _map158.size; ++_i161) + org.apache.thrift.protocol.TMap _map168 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.failed = new HashMap>(2*_map168.size); + String _key169; + Map _val170; + for (int _i171 = 0; _i171 < _map168.size; ++_i171) { - _key159 = iprot.readString(); + _key169 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map162 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val160 = new HashMap(2*_map162.size); - GlobalStreamId _key163; - long _val164; - for (int _i165 = 0; _i165 < _map162.size; ++_i165) + org.apache.thrift.protocol.TMap _map172 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val170 = new HashMap(2*_map172.size); + GlobalStreamId _key173; + long _val174; + for (int _i175 = 0; _i175 < _map172.size; ++_i175) { - _key163 = new GlobalStreamId(); - _key163.read(iprot); - _val164 = iprot.readI64(); - _val160.put(_key163, _val164); + _key173 = new GlobalStreamId(); + _key173.read(iprot); + _val174 = iprot.readI64(); + _val170.put(_key173, _val174); } } - struct.failed.put(_key159, _val160); + struct.failed.put(_key169, _val170); } } struct.set_failed_isSet(true); { - org.apache.thrift.protocol.TMap _map166 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.process_ms_avg = new HashMap>(2*_map166.size); - String _key167; - Map _val168; - for (int _i169 = 0; _i169 < _map166.size; ++_i169) + org.apache.thrift.protocol.TMap _map176 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.process_ms_avg = new HashMap>(2*_map176.size); + String _key177; + Map _val178; + for (int _i179 = 0; _i179 < _map176.size; ++_i179) { - _key167 = iprot.readString(); + _key177 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map170 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); - _val168 = new HashMap(2*_map170.size); - GlobalStreamId _key171; - double _val172; - for (int _i173 = 0; _i173 < _map170.size; ++_i173) + org.apache.thrift.protocol.TMap _map180 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + _val178 = new HashMap(2*_map180.size); + GlobalStreamId _key181; + double _val182; + for (int _i183 = 0; _i183 < _map180.size; ++_i183) { - _key171 = new GlobalStreamId(); - _key171.read(iprot); - _val172 = iprot.readDouble(); - _val168.put(_key171, _val172); + _key181 = new GlobalStreamId(); + _key181.read(iprot); + _val182 = iprot.readDouble(); + _val178.put(_key181, _val182); } } - struct.process_ms_avg.put(_key167, _val168); + struct.process_ms_avg.put(_key177, _val178); } } struct.set_process_ms_avg_isSet(true); { - org.apache.thrift.protocol.TMap _map174 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.executed = new HashMap>(2*_map174.size); - String _key175; - Map _val176; - for (int _i177 = 0; _i177 < _map174.size; ++_i177) + org.apache.thrift.protocol.TMap _map184 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.executed = new HashMap>(2*_map184.size); + String _key185; + Map _val186; + for (int _i187 = 0; _i187 < _map184.size; ++_i187) { - _key175 = iprot.readString(); + _key185 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map178 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val176 = new HashMap(2*_map178.size); - GlobalStreamId _key179; - long _val180; - for (int _i181 = 0; _i181 < _map178.size; ++_i181) + org.apache.thrift.protocol.TMap _map188 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val186 = new HashMap(2*_map188.size); + GlobalStreamId _key189; + long _val190; + for (int _i191 = 0; _i191 < _map188.size; ++_i191) { - _key179 = new GlobalStreamId(); - _key179.read(iprot); - _val180 = iprot.readI64(); - _val176.put(_key179, _val180); + _key189 = new GlobalStreamId(); + _key189.read(iprot); + _val190 = iprot.readI64(); + _val186.put(_key189, _val190); } } - struct.executed.put(_key175, _val176); + struct.executed.put(_key185, _val186); } } struct.set_executed_isSet(true); { - org.apache.thrift.protocol.TMap _map182 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.execute_ms_avg = new HashMap>(2*_map182.size); - String _key183; - Map _val184; - for (int _i185 = 0; _i185 < _map182.size; ++_i185) + org.apache.thrift.protocol.TMap _map192 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.execute_ms_avg = new HashMap>(2*_map192.size); + String _key193; + Map _val194; + for (int _i195 = 0; _i195 < _map192.size; ++_i195) { - _key183 = iprot.readString(); + _key193 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map186 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); - _val184 = new HashMap(2*_map186.size); - GlobalStreamId _key187; - double _val188; - for (int _i189 = 0; _i189 < _map186.size; ++_i189) + org.apache.thrift.protocol.TMap _map196 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + _val194 = new HashMap(2*_map196.size); + GlobalStreamId _key197; + double _val198; + for (int _i199 = 0; _i199 < _map196.size; ++_i199) { - _key187 = new GlobalStreamId(); - _key187.read(iprot); - _val188 = iprot.readDouble(); - _val184.put(_key187, _val188); + _key197 = new GlobalStreamId(); + _key197.read(iprot); + _val198 = iprot.readDouble(); + _val194.put(_key197, _val198); } } - struct.execute_ms_avg.put(_key183, _val184); + struct.execute_ms_avg.put(_key193, _val194); } } struct.set_execute_ms_avg_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java index ee25ac8811d..9295bbffa4a 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java +++ b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java @@ -51,7 +51,7 @@ 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-7-1") public class ClusterSummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterSummary"); @@ -561,14 +561,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterSummary stru case 1: // SUPERVISORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list74 = iprot.readListBegin(); - struct.supervisors = new ArrayList(_list74.size); - SupervisorSummary _elem75; - for (int _i76 = 0; _i76 < _list74.size; ++_i76) + org.apache.thrift.protocol.TList _list84 = iprot.readListBegin(); + struct.supervisors = new ArrayList(_list84.size); + SupervisorSummary _elem85; + for (int _i86 = 0; _i86 < _list84.size; ++_i86) { - _elem75 = new SupervisorSummary(); - _elem75.read(iprot); - struct.supervisors.add(_elem75); + _elem85 = new SupervisorSummary(); + _elem85.read(iprot); + struct.supervisors.add(_elem85); } iprot.readListEnd(); } @@ -588,14 +588,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterSummary stru case 3: // TOPOLOGIES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list77 = iprot.readListBegin(); - struct.topologies = new ArrayList(_list77.size); - TopologySummary _elem78; - for (int _i79 = 0; _i79 < _list77.size; ++_i79) + org.apache.thrift.protocol.TList _list87 = iprot.readListBegin(); + struct.topologies = new ArrayList(_list87.size); + TopologySummary _elem88; + for (int _i89 = 0; _i89 < _list87.size; ++_i89) { - _elem78 = new TopologySummary(); - _elem78.read(iprot); - struct.topologies.add(_elem78); + _elem88 = new TopologySummary(); + _elem88.read(iprot); + struct.topologies.add(_elem88); } iprot.readListEnd(); } @@ -621,9 +621,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterSummary str oprot.writeFieldBegin(SUPERVISORS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.supervisors.size())); - for (SupervisorSummary _iter80 : struct.supervisors) + for (SupervisorSummary _iter90 : struct.supervisors) { - _iter80.write(oprot); + _iter90.write(oprot); } oprot.writeListEnd(); } @@ -636,9 +636,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterSummary str oprot.writeFieldBegin(TOPOLOGIES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.topologies.size())); - for (TopologySummary _iter81 : struct.topologies) + for (TopologySummary _iter91 : struct.topologies) { - _iter81.write(oprot); + _iter91.write(oprot); } oprot.writeListEnd(); } @@ -663,17 +663,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ClusterSummary stru TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.supervisors.size()); - for (SupervisorSummary _iter82 : struct.supervisors) + for (SupervisorSummary _iter92 : struct.supervisors) { - _iter82.write(oprot); + _iter92.write(oprot); } } oprot.writeI32(struct.nimbus_uptime_secs); { oprot.writeI32(struct.topologies.size()); - for (TopologySummary _iter83 : struct.topologies) + for (TopologySummary _iter93 : struct.topologies) { - _iter83.write(oprot); + _iter93.write(oprot); } } } @@ -682,28 +682,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ClusterSummary stru public void read(org.apache.thrift.protocol.TProtocol prot, ClusterSummary struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list84 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.supervisors = new ArrayList(_list84.size); - SupervisorSummary _elem85; - for (int _i86 = 0; _i86 < _list84.size; ++_i86) + org.apache.thrift.protocol.TList _list94 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.supervisors = new ArrayList(_list94.size); + SupervisorSummary _elem95; + for (int _i96 = 0; _i96 < _list94.size; ++_i96) { - _elem85 = new SupervisorSummary(); - _elem85.read(iprot); - struct.supervisors.add(_elem85); + _elem95 = new SupervisorSummary(); + _elem95.read(iprot); + struct.supervisors.add(_elem95); } } struct.set_supervisors_isSet(true); struct.nimbus_uptime_secs = iprot.readI32(); struct.set_nimbus_uptime_secs_isSet(true); { - org.apache.thrift.protocol.TList _list87 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.topologies = new ArrayList(_list87.size); - TopologySummary _elem88; - for (int _i89 = 0; _i89 < _list87.size; ++_i89) + org.apache.thrift.protocol.TList _list97 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.topologies = new ArrayList(_list97.size); + TopologySummary _elem98; + for (int _i99 = 0; _i99 < _list97.size; ++_i99) { - _elem88 = new TopologySummary(); - _elem88.read(iprot); - struct.topologies.add(_elem88); + _elem98 = new TopologySummary(); + _elem98.read(iprot); + struct.topologies.add(_elem98); } } struct.set_topologies_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java index f60540b6858..a3d9f932240 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.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-7-1") public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterWorkerHeartbeat"); @@ -60,6 +59,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -71,13 +71,15 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase executor_stats; // required private int time_secs; // required private int uptime_secs; // required + private Map system_stats; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { STORM_ID((short)1, "storm_id"), EXECUTOR_STATS((short)2, "executor_stats"), TIME_SECS((short)3, "time_secs"), - UPTIME_SECS((short)4, "uptime_secs"); + UPTIME_SECS((short)4, "uptime_secs"), + SYSTEM_STATS((short)5, "system_stats"); private static final Map byName = new HashMap(); @@ -100,6 +102,8 @@ public static _Fields findByThriftId(int fieldId) { return TIME_SECS; case 4: // UPTIME_SECS return UPTIME_SECS; + case 5: // SYSTEM_STATS + return SYSTEM_STATS; default: return null; } @@ -143,6 +147,7 @@ public String getFieldName() { private static final int __TIME_SECS_ISSET_ID = 0; private static final int __UPTIME_SECS_ISSET_ID = 1; private byte __isset_bitfield = 0; + private static final _Fields optionals[] = {_Fields.SYSTEM_STATS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -156,6 +161,10 @@ public String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.SYSTEM_STATS, new org.apache.thrift.meta_data.FieldMetaData("system_stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClusterWorkerHeartbeat.class, metaDataMap); } @@ -203,6 +212,10 @@ public ClusterWorkerHeartbeat(ClusterWorkerHeartbeat other) { } this.time_secs = other.time_secs; this.uptime_secs = other.uptime_secs; + if (other.is_set_system_stats()) { + Map __this__system_stats = new HashMap(other.system_stats); + this.system_stats = __this__system_stats; + } } public ClusterWorkerHeartbeat deepCopy() { @@ -217,6 +230,7 @@ public void clear() { this.time_secs = 0; set_uptime_secs_isSet(false); this.uptime_secs = 0; + this.system_stats = null; } public String get_storm_id() { @@ -320,6 +334,40 @@ public void set_uptime_secs_isSet(boolean value) { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value); } + public int get_system_stats_size() { + return (this.system_stats == null) ? 0 : this.system_stats.size(); + } + + public void put_to_system_stats(String key, double val) { + if (this.system_stats == null) { + this.system_stats = new HashMap(); + } + this.system_stats.put(key, val); + } + + public Map get_system_stats() { + return this.system_stats; + } + + public void set_system_stats(Map system_stats) { + this.system_stats = system_stats; + } + + public void unset_system_stats() { + this.system_stats = null; + } + + /** Returns true if field system_stats is set (has been assigned a value) and false otherwise */ + public boolean is_set_system_stats() { + return this.system_stats != null; + } + + public void set_system_stats_isSet(boolean value) { + if (!value) { + this.system_stats = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case STORM_ID: @@ -354,6 +402,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case SYSTEM_STATS: + if (value == null) { + unset_system_stats(); + } else { + set_system_stats((Map)value); + } + break; + } } @@ -371,6 +427,9 @@ public Object getFieldValue(_Fields field) { case UPTIME_SECS: return Integer.valueOf(get_uptime_secs()); + case SYSTEM_STATS: + return get_system_stats(); + } throw new IllegalStateException(); } @@ -390,6 +449,8 @@ public boolean isSet(_Fields field) { return is_set_time_secs(); case UPTIME_SECS: return is_set_uptime_secs(); + case SYSTEM_STATS: + return is_set_system_stats(); } throw new IllegalStateException(); } @@ -443,6 +504,15 @@ public boolean equals(ClusterWorkerHeartbeat that) { return false; } + boolean this_present_system_stats = true && this.is_set_system_stats(); + boolean that_present_system_stats = true && that.is_set_system_stats(); + if (this_present_system_stats || that_present_system_stats) { + if (!(this_present_system_stats && that_present_system_stats)) + return false; + if (!this.system_stats.equals(that.system_stats)) + return false; + } + return true; } @@ -470,6 +540,11 @@ public int hashCode() { if (present_uptime_secs) list.add(uptime_secs); + boolean present_system_stats = true && (is_set_system_stats()); + list.add(present_system_stats); + if (present_system_stats) + list.add(system_stats); + return list.hashCode(); } @@ -521,6 +596,16 @@ public int compareTo(ClusterWorkerHeartbeat other) { return lastComparison; } } + lastComparison = Boolean.valueOf(is_set_system_stats()).compareTo(other.is_set_system_stats()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_system_stats()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.system_stats, other.system_stats); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -564,6 +649,16 @@ public String toString() { sb.append("uptime_secs:"); sb.append(this.uptime_secs); first = false; + if (is_set_system_stats()) { + if (!first) sb.append(", "); + sb.append("system_stats:"); + if (this.system_stats == null) { + sb.append("null"); + } else { + sb.append(this.system_stats); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -636,17 +731,17 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterWorkerHeartb 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(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(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(); } @@ -671,6 +766,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterWorkerHeartb org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 5: // SYSTEM_STATS + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map450 = iprot.readMapBegin(); + struct.system_stats = new HashMap(2*_map450.size); + String _key451; + double _val452; + for (int _i453 = 0; _i453 < _map450.size; ++_i453) + { + _key451 = iprot.readString(); + _val452 = iprot.readDouble(); + struct.system_stats.put(_key451, _val452); + } + iprot.readMapEnd(); + } + struct.set_system_stats_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -693,10 +808,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterWorkerHeart 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 _iter430 : struct.executor_stats.entrySet()) + for (Map.Entry _iter454 : struct.executor_stats.entrySet()) { - _iter430.getKey().write(oprot); - _iter430.getValue().write(oprot); + _iter454.getKey().write(oprot); + _iter454.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -708,6 +823,21 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterWorkerHeart oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC); oprot.writeI32(struct.uptime_secs); oprot.writeFieldEnd(); + if (struct.system_stats != null) { + if (struct.is_set_system_stats()) { + oprot.writeFieldBegin(SYSTEM_STATS_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.system_stats.size())); + for (Map.Entry _iter455 : struct.system_stats.entrySet()) + { + oprot.writeString(_iter455.getKey()); + oprot.writeDouble(_iter455.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -728,14 +858,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ClusterWorkerHeartb oprot.writeString(struct.storm_id); { oprot.writeI32(struct.executor_stats.size()); - for (Map.Entry _iter431 : struct.executor_stats.entrySet()) + for (Map.Entry _iter456 : struct.executor_stats.entrySet()) { - _iter431.getKey().write(oprot); - _iter431.getValue().write(oprot); + _iter456.getKey().write(oprot); + _iter456.getValue().write(oprot); } } oprot.writeI32(struct.time_secs); oprot.writeI32(struct.uptime_secs); + BitSet optionals = new BitSet(); + if (struct.is_set_system_stats()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.is_set_system_stats()) { + { + oprot.writeI32(struct.system_stats.size()); + for (Map.Entry _iter457 : struct.system_stats.entrySet()) + { + oprot.writeString(_iter457.getKey()); + oprot.writeDouble(_iter457.getValue()); + } + } + } } @Override @@ -744,17 +889,17 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ClusterWorkerHeartbe 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(2*_map432.size); - ExecutorInfo _key433; - ExecutorStats _val434; - for (int _i435 = 0; _i435 < _map432.size; ++_i435) + org.apache.thrift.protocol.TMap _map458 = 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(2*_map458.size); + ExecutorInfo _key459; + ExecutorStats _val460; + for (int _i461 = 0; _i461 < _map458.size; ++_i461) { - _key433 = new ExecutorInfo(); - _key433.read(iprot); - _val434 = new ExecutorStats(); - _val434.read(iprot); - struct.executor_stats.put(_key433, _val434); + _key459 = new ExecutorInfo(); + _key459.read(iprot); + _val460 = new ExecutorStats(); + _val460.read(iprot); + struct.executor_stats.put(_key459, _val460); } } struct.set_executor_stats_isSet(true); @@ -762,6 +907,22 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ClusterWorkerHeartbe struct.set_time_secs_isSet(true); struct.uptime_secs = iprot.readI32(); struct.set_uptime_secs_isSet(true); + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + { + org.apache.thrift.protocol.TMap _map462 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + struct.system_stats = new HashMap(2*_map462.size); + String _key463; + double _val464; + for (int _i465 = 0; _i465 < _map462.size; ++_i465) + { + _key463 = iprot.readString(); + _val464 = iprot.readDouble(); + struct.system_stats.put(_key463, _val464); + } + } + struct.set_system_stats_isSet(true); + } } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java index 68686035120..80fbe05d341 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java +++ b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java @@ -51,7 +51,7 @@ 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-7-1") public class ComponentCommon implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentCommon"); diff --git a/storm-core/src/jvm/backtype/storm/generated/Credentials.java b/storm-core/src/jvm/backtype/storm/generated/Credentials.java index c1ef29311f2..00a56500096 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.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-7-1") public class Credentials implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials"); @@ -365,15 +365,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Credentials struct) case 1: // CREDS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map326 = iprot.readMapBegin(); - struct.creds = new HashMap(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(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 void write(org.apache.thrift.protocol.TProtocol oprot, Credentials struct 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 _iter330 : struct.creds.entrySet()) + for (Map.Entry _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 void write(org.apache.thrift.protocol.TProtocol prot, Credentials struct) TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.creds.size()); - for (Map.Entry _iter331 : struct.creds.entrySet()) + for (Map.Entry _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 void write(org.apache.thrift.protocol.TProtocol prot, Credentials struct) 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(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(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); diff --git a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java index f61ffa19d55..e44c91648ec 100644 --- a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java +++ b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java @@ -51,7 +51,7 @@ 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-7-1") public class DRPCExecutionException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCExecutionException"); diff --git a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java index b97fa2504cd..9981df19e85 100644 --- a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java +++ b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java @@ -51,7 +51,7 @@ 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-7-1") public class DRPCRequest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCRequest"); diff --git a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java index c4f25ec0b71..1490a155699 100644 --- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java +++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java @@ -51,7 +51,7 @@ 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-7-1") public class DistributedRPC { public interface Iface { diff --git a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java index 94b799be50e..fdf1f32979f 100644 --- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java +++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java @@ -51,7 +51,7 @@ 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-7-1") public class DistributedRPCInvocations { public interface Iface { diff --git a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java index 32495c79dd6..a74cf7152ca 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java @@ -51,7 +51,7 @@ 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-7-1") public class ErrorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorInfo"); diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java index 44415ce656d..a7bd2e3c632 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java @@ -51,7 +51,7 @@ 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-7-1") public class ExecutorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorInfo"); diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java index 001fcfffc98..d84f7dd5cec 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java +++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java @@ -51,7 +51,7 @@ 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-7-1") public class ExecutorStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorStats"); @@ -660,27 +660,27 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorStats struc case 1: // EMITTED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map250 = iprot.readMapBegin(); - struct.emitted = new HashMap>(2*_map250.size); - String _key251; - Map _val252; - for (int _i253 = 0; _i253 < _map250.size; ++_i253) + org.apache.thrift.protocol.TMap _map260 = iprot.readMapBegin(); + struct.emitted = new HashMap>(2*_map260.size); + String _key261; + Map _val262; + for (int _i263 = 0; _i263 < _map260.size; ++_i263) { - _key251 = iprot.readString(); + _key261 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map254 = iprot.readMapBegin(); - _val252 = new HashMap(2*_map254.size); - String _key255; - long _val256; - for (int _i257 = 0; _i257 < _map254.size; ++_i257) + org.apache.thrift.protocol.TMap _map264 = iprot.readMapBegin(); + _val262 = new HashMap(2*_map264.size); + String _key265; + long _val266; + for (int _i267 = 0; _i267 < _map264.size; ++_i267) { - _key255 = iprot.readString(); - _val256 = iprot.readI64(); - _val252.put(_key255, _val256); + _key265 = iprot.readString(); + _val266 = iprot.readI64(); + _val262.put(_key265, _val266); } iprot.readMapEnd(); } - struct.emitted.put(_key251, _val252); + struct.emitted.put(_key261, _val262); } iprot.readMapEnd(); } @@ -692,27 +692,27 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorStats struc case 2: // TRANSFERRED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map258 = iprot.readMapBegin(); - struct.transferred = new HashMap>(2*_map258.size); - String _key259; - Map _val260; - for (int _i261 = 0; _i261 < _map258.size; ++_i261) + org.apache.thrift.protocol.TMap _map268 = iprot.readMapBegin(); + struct.transferred = new HashMap>(2*_map268.size); + String _key269; + Map _val270; + for (int _i271 = 0; _i271 < _map268.size; ++_i271) { - _key259 = iprot.readString(); + _key269 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map262 = iprot.readMapBegin(); - _val260 = new HashMap(2*_map262.size); - String _key263; - long _val264; - for (int _i265 = 0; _i265 < _map262.size; ++_i265) + org.apache.thrift.protocol.TMap _map272 = iprot.readMapBegin(); + _val270 = new HashMap(2*_map272.size); + String _key273; + long _val274; + for (int _i275 = 0; _i275 < _map272.size; ++_i275) { - _key263 = iprot.readString(); - _val264 = iprot.readI64(); - _val260.put(_key263, _val264); + _key273 = iprot.readString(); + _val274 = iprot.readI64(); + _val270.put(_key273, _val274); } iprot.readMapEnd(); } - struct.transferred.put(_key259, _val260); + struct.transferred.put(_key269, _val270); } iprot.readMapEnd(); } @@ -755,15 +755,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorStats stru oprot.writeFieldBegin(EMITTED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.emitted.size())); - for (Map.Entry> _iter266 : struct.emitted.entrySet()) + for (Map.Entry> _iter276 : struct.emitted.entrySet()) { - oprot.writeString(_iter266.getKey()); + oprot.writeString(_iter276.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter266.getValue().size())); - for (Map.Entry _iter267 : _iter266.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter276.getValue().size())); + for (Map.Entry _iter277 : _iter276.getValue().entrySet()) { - oprot.writeString(_iter267.getKey()); - oprot.writeI64(_iter267.getValue()); + oprot.writeString(_iter277.getKey()); + oprot.writeI64(_iter277.getValue()); } oprot.writeMapEnd(); } @@ -776,15 +776,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorStats stru oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.transferred.size())); - for (Map.Entry> _iter268 : struct.transferred.entrySet()) + for (Map.Entry> _iter278 : struct.transferred.entrySet()) { - oprot.writeString(_iter268.getKey()); + oprot.writeString(_iter278.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter268.getValue().size())); - for (Map.Entry _iter269 : _iter268.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter278.getValue().size())); + for (Map.Entry _iter279 : _iter278.getValue().entrySet()) { - oprot.writeString(_iter269.getKey()); - oprot.writeI64(_iter269.getValue()); + oprot.writeString(_iter279.getKey()); + oprot.writeI64(_iter279.getValue()); } oprot.writeMapEnd(); } @@ -820,30 +820,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struc TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.emitted.size()); - for (Map.Entry> _iter270 : struct.emitted.entrySet()) + for (Map.Entry> _iter280 : struct.emitted.entrySet()) { - oprot.writeString(_iter270.getKey()); + oprot.writeString(_iter280.getKey()); { - oprot.writeI32(_iter270.getValue().size()); - for (Map.Entry _iter271 : _iter270.getValue().entrySet()) + oprot.writeI32(_iter280.getValue().size()); + for (Map.Entry _iter281 : _iter280.getValue().entrySet()) { - oprot.writeString(_iter271.getKey()); - oprot.writeI64(_iter271.getValue()); + oprot.writeString(_iter281.getKey()); + oprot.writeI64(_iter281.getValue()); } } } } { oprot.writeI32(struct.transferred.size()); - for (Map.Entry> _iter272 : struct.transferred.entrySet()) + for (Map.Entry> _iter282 : struct.transferred.entrySet()) { - oprot.writeString(_iter272.getKey()); + oprot.writeString(_iter282.getKey()); { - oprot.writeI32(_iter272.getValue().size()); - for (Map.Entry _iter273 : _iter272.getValue().entrySet()) + oprot.writeI32(_iter282.getValue().size()); + for (Map.Entry _iter283 : _iter282.getValue().entrySet()) { - oprot.writeString(_iter273.getKey()); - oprot.writeI64(_iter273.getValue()); + oprot.writeString(_iter283.getKey()); + oprot.writeI64(_iter283.getValue()); } } } @@ -856,50 +856,50 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struc public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TMap _map274 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.emitted = new HashMap>(2*_map274.size); - String _key275; - Map _val276; - for (int _i277 = 0; _i277 < _map274.size; ++_i277) + org.apache.thrift.protocol.TMap _map284 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.emitted = new HashMap>(2*_map284.size); + String _key285; + Map _val286; + for (int _i287 = 0; _i287 < _map284.size; ++_i287) { - _key275 = iprot.readString(); + _key285 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map278 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val276 = new HashMap(2*_map278.size); - String _key279; - long _val280; - for (int _i281 = 0; _i281 < _map278.size; ++_i281) + org.apache.thrift.protocol.TMap _map288 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val286 = new HashMap(2*_map288.size); + String _key289; + long _val290; + for (int _i291 = 0; _i291 < _map288.size; ++_i291) { - _key279 = iprot.readString(); - _val280 = iprot.readI64(); - _val276.put(_key279, _val280); + _key289 = iprot.readString(); + _val290 = iprot.readI64(); + _val286.put(_key289, _val290); } } - struct.emitted.put(_key275, _val276); + struct.emitted.put(_key285, _val286); } } struct.set_emitted_isSet(true); { - org.apache.thrift.protocol.TMap _map282 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.transferred = new HashMap>(2*_map282.size); - String _key283; - Map _val284; - for (int _i285 = 0; _i285 < _map282.size; ++_i285) + org.apache.thrift.protocol.TMap _map292 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.transferred = new HashMap>(2*_map292.size); + String _key293; + Map _val294; + for (int _i295 = 0; _i295 < _map292.size; ++_i295) { - _key283 = iprot.readString(); + _key293 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map286 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val284 = new HashMap(2*_map286.size); - String _key287; - long _val288; - for (int _i289 = 0; _i289 < _map286.size; ++_i289) + org.apache.thrift.protocol.TMap _map296 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val294 = new HashMap(2*_map296.size); + String _key297; + long _val298; + for (int _i299 = 0; _i299 < _map296.size; ++_i299) { - _key287 = iprot.readString(); - _val288 = iprot.readI64(); - _val284.put(_key287, _val288); + _key297 = iprot.readString(); + _val298 = iprot.readI64(); + _val294.put(_key297, _val298); } } - struct.transferred.put(_key283, _val284); + struct.transferred.put(_key293, _val294); } } struct.set_transferred_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java index 649342d7754..e4e3127330f 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java +++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java @@ -51,7 +51,7 @@ 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-7-1") public class ExecutorSummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSummary"); diff --git a/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java b/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java index 2d5defc837c..92b8351756b 100644 --- a/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java +++ b/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java @@ -51,7 +51,7 @@ 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-7-1") public class GetInfoOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetInfoOptions"); diff --git a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java index 017ad4f7863..3b0f5c42b02 100644 --- a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java +++ b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java @@ -51,7 +51,7 @@ 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-7-1") public class GlobalStreamId implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobalStreamId"); diff --git a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java index 5a984180ace..fdfa4bd4a26 100644 --- a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java +++ b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java @@ -51,7 +51,7 @@ 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-7-1") public class InvalidTopologyException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTopologyException"); diff --git a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java index fde00825157..7904b15aeb3 100644 --- a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java +++ b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java @@ -51,7 +51,7 @@ 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-7-1") public class JavaObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObject"); diff --git a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java index f1733956cfb..69dd0720611 100644 --- a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java +++ b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java @@ -51,7 +51,7 @@ 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-7-1") public class KillOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KillOptions"); diff --git a/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java b/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java index 1d97dca5bdb..578eb9eeb03 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.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-7-1") public class LSApprovedWorkers implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSApprovedWorkers"); @@ -365,15 +365,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSApprovedWorkers s 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(2*_map454.size); - String _key455; - int _val456; - for (int _i457 = 0; _i457 < _map454.size; ++_i457) + org.apache.thrift.protocol.TMap _map484 = iprot.readMapBegin(); + struct.approved_workers = new HashMap(2*_map484.size); + String _key485; + int _val486; + for (int _i487 = 0; _i487 < _map484.size; ++_i487) { - _key455 = iprot.readString(); - _val456 = iprot.readI32(); - struct.approved_workers.put(_key455, _val456); + _key485 = iprot.readString(); + _val486 = iprot.readI32(); + struct.approved_workers.put(_key485, _val486); } iprot.readMapEnd(); } @@ -399,10 +399,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSApprovedWorkers 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 _iter458 : struct.approved_workers.entrySet()) + for (Map.Entry _iter488 : struct.approved_workers.entrySet()) { - oprot.writeString(_iter458.getKey()); - oprot.writeI32(_iter458.getValue()); + oprot.writeString(_iter488.getKey()); + oprot.writeI32(_iter488.getValue()); } oprot.writeMapEnd(); } @@ -427,10 +427,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers s TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.approved_workers.size()); - for (Map.Entry _iter459 : struct.approved_workers.entrySet()) + for (Map.Entry _iter489 : struct.approved_workers.entrySet()) { - oprot.writeString(_iter459.getKey()); - oprot.writeI32(_iter459.getValue()); + oprot.writeString(_iter489.getKey()); + oprot.writeI32(_iter489.getValue()); } } } @@ -439,15 +439,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers s 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(2*_map460.size); - String _key461; - int _val462; - for (int _i463 = 0; _i463 < _map460.size; ++_i463) + org.apache.thrift.protocol.TMap _map490 = 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(2*_map490.size); + String _key491; + int _val492; + for (int _i493 = 0; _i493 < _map490.size; ++_i493) { - _key461 = iprot.readString(); - _val462 = iprot.readI32(); - struct.approved_workers.put(_key461, _val462); + _key491 = iprot.readString(); + _val492 = iprot.readI32(); + struct.approved_workers.put(_key491, _val492); } } struct.set_approved_workers_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java index 466728775ee..d5cb4edbcd9 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.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-7-1") public class LSSupervisorAssignments implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorAssignments"); @@ -376,16 +376,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSSupervisorAssignm case 1: // ASSIGNMENTS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map464 = iprot.readMapBegin(); - struct.assignments = new HashMap(2*_map464.size); - int _key465; - LocalAssignment _val466; - for (int _i467 = 0; _i467 < _map464.size; ++_i467) + org.apache.thrift.protocol.TMap _map494 = iprot.readMapBegin(); + struct.assignments = new HashMap(2*_map494.size); + int _key495; + LocalAssignment _val496; + for (int _i497 = 0; _i497 < _map494.size; ++_i497) { - _key465 = iprot.readI32(); - _val466 = new LocalAssignment(); - _val466.read(iprot); - struct.assignments.put(_key465, _val466); + _key495 = iprot.readI32(); + _val496 = new LocalAssignment(); + _val496.read(iprot); + struct.assignments.put(_key495, _val496); } iprot.readMapEnd(); } @@ -411,10 +411,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSSupervisorAssign 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 _iter468 : struct.assignments.entrySet()) + for (Map.Entry _iter498 : struct.assignments.entrySet()) { - oprot.writeI32(_iter468.getKey()); - _iter468.getValue().write(oprot); + oprot.writeI32(_iter498.getKey()); + _iter498.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -439,10 +439,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignm TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.assignments.size()); - for (Map.Entry _iter469 : struct.assignments.entrySet()) + for (Map.Entry _iter499 : struct.assignments.entrySet()) { - oprot.writeI32(_iter469.getKey()); - _iter469.getValue().write(oprot); + oprot.writeI32(_iter499.getKey()); + _iter499.getValue().write(oprot); } } } @@ -451,16 +451,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignm 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(2*_map470.size); - int _key471; - LocalAssignment _val472; - for (int _i473 = 0; _i473 < _map470.size; ++_i473) + org.apache.thrift.protocol.TMap _map500 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.assignments = new HashMap(2*_map500.size); + int _key501; + LocalAssignment _val502; + for (int _i503 = 0; _i503 < _map500.size; ++_i503) { - _key471 = iprot.readI32(); - _val472 = new LocalAssignment(); - _val472.read(iprot); - struct.assignments.put(_key471, _val472); + _key501 = iprot.readI32(); + _val502 = new LocalAssignment(); + _val502.read(iprot); + struct.assignments.put(_key501, _val502); } } struct.set_assignments_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorId.java b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorId.java index 6ee4dad38cd..f9d72d7848e 100644 --- a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorId.java +++ b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorId.java @@ -51,7 +51,7 @@ 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-7-1") public class LSSupervisorId implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorId"); diff --git a/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java b/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java index 80f917b1c3f..36292f7391e 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.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-7-1") public class LSWorkerHeartbeat implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSWorkerHeartbeat"); @@ -638,14 +638,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSWorkerHeartbeat s case 3: // EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list474 = iprot.readListBegin(); - struct.executors = new ArrayList(_list474.size); - ExecutorInfo _elem475; - for (int _i476 = 0; _i476 < _list474.size; ++_i476) + org.apache.thrift.protocol.TList _list504 = iprot.readListBegin(); + struct.executors = new ArrayList(_list504.size); + ExecutorInfo _elem505; + for (int _i506 = 0; _i506 < _list504.size; ++_i506) { - _elem475 = new ExecutorInfo(); - _elem475.read(iprot); - struct.executors.add(_elem475); + _elem505 = new ExecutorInfo(); + _elem505.read(iprot); + struct.executors.add(_elem505); } iprot.readListEnd(); } @@ -687,9 +687,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSWorkerHeartbeat 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 _iter507 : struct.executors) { - _iter477.write(oprot); + _iter507.write(oprot); } oprot.writeListEnd(); } @@ -719,9 +719,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSWorkerHeartbeat s oprot.writeString(struct.topology_id); { oprot.writeI32(struct.executors.size()); - for (ExecutorInfo _iter478 : struct.executors) + for (ExecutorInfo _iter508 : struct.executors) { - _iter478.write(oprot); + _iter508.write(oprot); } } oprot.writeI32(struct.port); @@ -735,14 +735,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, LSWorkerHeartbeat st 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(_list479.size); - ExecutorInfo _elem480; - for (int _i481 = 0; _i481 < _list479.size; ++_i481) + org.apache.thrift.protocol.TList _list509 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList(_list509.size); + ExecutorInfo _elem510; + for (int _i511 = 0; _i511 < _list509.size; ++_i511) { - _elem480 = new ExecutorInfo(); - _elem480.read(iprot); - struct.executors.add(_elem480); + _elem510 = new ExecutorInfo(); + _elem510.read(iprot); + struct.executors.add(_elem510); } } struct.set_executors_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java b/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java index 3c348915399..4cc0e828234 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.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-7-1") public class LocalAssignment implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalAssignment"); @@ -464,14 +464,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LocalAssignment str case 2: // EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list446 = iprot.readListBegin(); - struct.executors = new ArrayList(_list446.size); - ExecutorInfo _elem447; - for (int _i448 = 0; _i448 < _list446.size; ++_i448) + org.apache.thrift.protocol.TList _list476 = iprot.readListBegin(); + struct.executors = new ArrayList(_list476.size); + ExecutorInfo _elem477; + for (int _i478 = 0; _i478 < _list476.size; ++_i478) { - _elem447 = new ExecutorInfo(); - _elem447.read(iprot); - struct.executors.add(_elem447); + _elem477 = new ExecutorInfo(); + _elem477.read(iprot); + struct.executors.add(_elem477); } iprot.readListEnd(); } @@ -502,9 +502,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LocalAssignment st 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 _iter479 : struct.executors) { - _iter449.write(oprot); + _iter479.write(oprot); } oprot.writeListEnd(); } @@ -530,9 +530,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LocalAssignment str oprot.writeString(struct.topology_id); { oprot.writeI32(struct.executors.size()); - for (ExecutorInfo _iter450 : struct.executors) + for (ExecutorInfo _iter480 : struct.executors) { - _iter450.write(oprot); + _iter480.write(oprot); } } } @@ -543,14 +543,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, LocalAssignment stru 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(_list451.size); - ExecutorInfo _elem452; - for (int _i453 = 0; _i453 < _list451.size; ++_i453) + org.apache.thrift.protocol.TList _list481 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList(_list481.size); + ExecutorInfo _elem482; + for (int _i483 = 0; _i483 < _list481.size; ++_i483) { - _elem452 = new ExecutorInfo(); - _elem452.read(iprot); - struct.executors.add(_elem452); + _elem482 = new ExecutorInfo(); + _elem482.read(iprot); + struct.executors.add(_elem482); } } struct.set_executors_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java b/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java index 448711d95c2..eda56207173 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.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-7-1") public class LocalStateData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalStateData"); @@ -376,16 +376,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LocalStateData stru 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(2*_map436.size); - String _key437; - ThriftSerializedObject _val438; - for (int _i439 = 0; _i439 < _map436.size; ++_i439) + org.apache.thrift.protocol.TMap _map466 = iprot.readMapBegin(); + struct.serialized_parts = new HashMap(2*_map466.size); + String _key467; + ThriftSerializedObject _val468; + for (int _i469 = 0; _i469 < _map466.size; ++_i469) { - _key437 = iprot.readString(); - _val438 = new ThriftSerializedObject(); - _val438.read(iprot); - struct.serialized_parts.put(_key437, _val438); + _key467 = iprot.readString(); + _val468 = new ThriftSerializedObject(); + _val468.read(iprot); + struct.serialized_parts.put(_key467, _val468); } iprot.readMapEnd(); } @@ -411,10 +411,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LocalStateData str 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 _iter440 : struct.serialized_parts.entrySet()) + for (Map.Entry _iter470 : struct.serialized_parts.entrySet()) { - oprot.writeString(_iter440.getKey()); - _iter440.getValue().write(oprot); + oprot.writeString(_iter470.getKey()); + _iter470.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -439,10 +439,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LocalStateData stru TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.serialized_parts.size()); - for (Map.Entry _iter441 : struct.serialized_parts.entrySet()) + for (Map.Entry _iter471 : struct.serialized_parts.entrySet()) { - oprot.writeString(_iter441.getKey()); - _iter441.getValue().write(oprot); + oprot.writeString(_iter471.getKey()); + _iter471.getValue().write(oprot); } } } @@ -451,16 +451,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LocalStateData stru 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(2*_map442.size); - String _key443; - ThriftSerializedObject _val444; - for (int _i445 = 0; _i445 < _map442.size; ++_i445) + org.apache.thrift.protocol.TMap _map472 = 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(2*_map472.size); + String _key473; + ThriftSerializedObject _val474; + for (int _i475 = 0; _i475 < _map472.size; ++_i475) { - _key443 = iprot.readString(); - _val444 = new ThriftSerializedObject(); - _val444.read(iprot); - struct.serialized_parts.put(_key443, _val444); + _key473 = iprot.readString(); + _val474 = new ThriftSerializedObject(); + _val474.read(iprot); + struct.serialized_parts.put(_key473, _val474); } } struct.set_serialized_parts_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java index cfc44968c4d..6d8af12846f 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.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-20") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-1") public class Nimbus { public interface Iface { diff --git a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java index a71d1b4154b..09de7a6a501 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.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-7-1") public class NodeInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeInfo"); @@ -461,13 +461,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, NodeInfo struct) th case 2: // PORT if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set362 = iprot.readSetBegin(); - struct.port = new HashSet(2*_set362.size); - long _elem363; - for (int _i364 = 0; _i364 < _set362.size; ++_i364) + org.apache.thrift.protocol.TSet _set382 = iprot.readSetBegin(); + struct.port = new HashSet(2*_set382.size); + long _elem383; + for (int _i384 = 0; _i384 < _set382.size; ++_i384) { - _elem363 = iprot.readI64(); - struct.port.add(_elem363); + _elem383 = iprot.readI64(); + struct.port.add(_elem383); } iprot.readSetEnd(); } @@ -498,9 +498,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NodeInfo struct) t 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 _iter385 : struct.port) { - oprot.writeI64(_iter365); + oprot.writeI64(_iter385); } oprot.writeSetEnd(); } @@ -526,9 +526,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NodeInfo struct) th oprot.writeString(struct.node); { oprot.writeI32(struct.port.size()); - for (long _iter366 : struct.port) + for (long _iter386 : struct.port) { - oprot.writeI64(_iter366); + oprot.writeI64(_iter386); } } } @@ -539,13 +539,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, NodeInfo struct) thr 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(2*_set367.size); - long _elem368; - for (int _i369 = 0; _i369 < _set367.size; ++_i369) + org.apache.thrift.protocol.TSet _set387 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.port = new HashSet(2*_set387.size); + long _elem388; + for (int _i389 = 0; _i389 < _set387.size; ++_i389) { - _elem368 = iprot.readI64(); - struct.port.add(_elem368); + _elem388 = iprot.readI64(); + struct.port.add(_elem388); } } struct.set_port_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java index 100da84de47..9b904ec3cce 100644 --- a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java +++ b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java @@ -51,7 +51,7 @@ 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-7-1") public class NotAliveException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotAliveException"); diff --git a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java index f44bccd8961..7618668d63e 100644 --- a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java +++ b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java @@ -51,7 +51,7 @@ 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-7-1") public class NullStruct implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NullStruct"); diff --git a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java index f973ffc3e81..69ebc9d3083 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.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-7-1") public class RebalanceOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions"); @@ -529,15 +529,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RebalanceOptions st 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(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(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 void write(org.apache.thrift.protocol.TProtocol oprot, RebalanceOptions s 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 _iter320 : struct.num_executors.entrySet()) + for (Map.Entry _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 void write(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions st if (struct.is_set_num_executors()) { { oprot.writeI32(struct.num_executors.size()); - for (Map.Entry _iter321 : struct.num_executors.entrySet()) + for (Map.Entry _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 void read(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions str } 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(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(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); diff --git a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java index 27303f15936..e7b2d9ed38e 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java +++ b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java @@ -51,7 +51,7 @@ 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-7-1") public class ShellComponent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShellComponent"); diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java index 42fd37b807c..269dc3b872a 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java +++ b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java @@ -51,7 +51,7 @@ 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-7-1") public class SpoutSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutSpec"); diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java index 7826fe4b716..30f57e892ba 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java +++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java @@ -51,7 +51,7 @@ 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-7-1") public class SpoutStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutStats"); @@ -602,27 +602,27 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutStats struct) case 1: // ACKED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map190 = iprot.readMapBegin(); - struct.acked = new HashMap>(2*_map190.size); - String _key191; - Map _val192; - for (int _i193 = 0; _i193 < _map190.size; ++_i193) + org.apache.thrift.protocol.TMap _map200 = iprot.readMapBegin(); + struct.acked = new HashMap>(2*_map200.size); + String _key201; + Map _val202; + for (int _i203 = 0; _i203 < _map200.size; ++_i203) { - _key191 = iprot.readString(); + _key201 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map194 = iprot.readMapBegin(); - _val192 = new HashMap(2*_map194.size); - String _key195; - long _val196; - for (int _i197 = 0; _i197 < _map194.size; ++_i197) + org.apache.thrift.protocol.TMap _map204 = iprot.readMapBegin(); + _val202 = new HashMap(2*_map204.size); + String _key205; + long _val206; + for (int _i207 = 0; _i207 < _map204.size; ++_i207) { - _key195 = iprot.readString(); - _val196 = iprot.readI64(); - _val192.put(_key195, _val196); + _key205 = iprot.readString(); + _val206 = iprot.readI64(); + _val202.put(_key205, _val206); } iprot.readMapEnd(); } - struct.acked.put(_key191, _val192); + struct.acked.put(_key201, _val202); } iprot.readMapEnd(); } @@ -634,27 +634,27 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutStats struct) case 2: // FAILED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map198 = iprot.readMapBegin(); - struct.failed = new HashMap>(2*_map198.size); - String _key199; - Map _val200; - for (int _i201 = 0; _i201 < _map198.size; ++_i201) + org.apache.thrift.protocol.TMap _map208 = iprot.readMapBegin(); + struct.failed = new HashMap>(2*_map208.size); + String _key209; + Map _val210; + for (int _i211 = 0; _i211 < _map208.size; ++_i211) { - _key199 = iprot.readString(); + _key209 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map202 = iprot.readMapBegin(); - _val200 = new HashMap(2*_map202.size); - String _key203; - long _val204; - for (int _i205 = 0; _i205 < _map202.size; ++_i205) + org.apache.thrift.protocol.TMap _map212 = iprot.readMapBegin(); + _val210 = new HashMap(2*_map212.size); + String _key213; + long _val214; + for (int _i215 = 0; _i215 < _map212.size; ++_i215) { - _key203 = iprot.readString(); - _val204 = iprot.readI64(); - _val200.put(_key203, _val204); + _key213 = iprot.readString(); + _val214 = iprot.readI64(); + _val210.put(_key213, _val214); } iprot.readMapEnd(); } - struct.failed.put(_key199, _val200); + struct.failed.put(_key209, _val210); } iprot.readMapEnd(); } @@ -666,27 +666,27 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutStats struct) case 3: // COMPLETE_MS_AVG if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map206 = iprot.readMapBegin(); - struct.complete_ms_avg = new HashMap>(2*_map206.size); - String _key207; - Map _val208; - for (int _i209 = 0; _i209 < _map206.size; ++_i209) + org.apache.thrift.protocol.TMap _map216 = iprot.readMapBegin(); + struct.complete_ms_avg = new HashMap>(2*_map216.size); + String _key217; + Map _val218; + for (int _i219 = 0; _i219 < _map216.size; ++_i219) { - _key207 = iprot.readString(); + _key217 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map210 = iprot.readMapBegin(); - _val208 = new HashMap(2*_map210.size); - String _key211; - double _val212; - for (int _i213 = 0; _i213 < _map210.size; ++_i213) + org.apache.thrift.protocol.TMap _map220 = iprot.readMapBegin(); + _val218 = new HashMap(2*_map220.size); + String _key221; + double _val222; + for (int _i223 = 0; _i223 < _map220.size; ++_i223) { - _key211 = iprot.readString(); - _val212 = iprot.readDouble(); - _val208.put(_key211, _val212); + _key221 = iprot.readString(); + _val222 = iprot.readDouble(); + _val218.put(_key221, _val222); } iprot.readMapEnd(); } - struct.complete_ms_avg.put(_key207, _val208); + struct.complete_ms_avg.put(_key217, _val218); } iprot.readMapEnd(); } @@ -712,15 +712,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutStats struct) oprot.writeFieldBegin(ACKED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.acked.size())); - for (Map.Entry> _iter214 : struct.acked.entrySet()) + for (Map.Entry> _iter224 : struct.acked.entrySet()) { - oprot.writeString(_iter214.getKey()); + oprot.writeString(_iter224.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter214.getValue().size())); - for (Map.Entry _iter215 : _iter214.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter224.getValue().size())); + for (Map.Entry _iter225 : _iter224.getValue().entrySet()) { - oprot.writeString(_iter215.getKey()); - oprot.writeI64(_iter215.getValue()); + oprot.writeString(_iter225.getKey()); + oprot.writeI64(_iter225.getValue()); } oprot.writeMapEnd(); } @@ -733,15 +733,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutStats struct) oprot.writeFieldBegin(FAILED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.failed.size())); - for (Map.Entry> _iter216 : struct.failed.entrySet()) + for (Map.Entry> _iter226 : struct.failed.entrySet()) { - oprot.writeString(_iter216.getKey()); + oprot.writeString(_iter226.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter216.getValue().size())); - for (Map.Entry _iter217 : _iter216.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter226.getValue().size())); + for (Map.Entry _iter227 : _iter226.getValue().entrySet()) { - oprot.writeString(_iter217.getKey()); - oprot.writeI64(_iter217.getValue()); + oprot.writeString(_iter227.getKey()); + oprot.writeI64(_iter227.getValue()); } oprot.writeMapEnd(); } @@ -754,15 +754,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutStats struct) oprot.writeFieldBegin(COMPLETE_MS_AVG_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.complete_ms_avg.size())); - for (Map.Entry> _iter218 : struct.complete_ms_avg.entrySet()) + for (Map.Entry> _iter228 : struct.complete_ms_avg.entrySet()) { - oprot.writeString(_iter218.getKey()); + oprot.writeString(_iter228.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter218.getValue().size())); - for (Map.Entry _iter219 : _iter218.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter228.getValue().size())); + for (Map.Entry _iter229 : _iter228.getValue().entrySet()) { - oprot.writeString(_iter219.getKey()); - oprot.writeDouble(_iter219.getValue()); + oprot.writeString(_iter229.getKey()); + oprot.writeDouble(_iter229.getValue()); } oprot.writeMapEnd(); } @@ -790,45 +790,45 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SpoutStats struct) TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.acked.size()); - for (Map.Entry> _iter220 : struct.acked.entrySet()) + for (Map.Entry> _iter230 : struct.acked.entrySet()) { - oprot.writeString(_iter220.getKey()); + oprot.writeString(_iter230.getKey()); { - oprot.writeI32(_iter220.getValue().size()); - for (Map.Entry _iter221 : _iter220.getValue().entrySet()) + oprot.writeI32(_iter230.getValue().size()); + for (Map.Entry _iter231 : _iter230.getValue().entrySet()) { - oprot.writeString(_iter221.getKey()); - oprot.writeI64(_iter221.getValue()); + oprot.writeString(_iter231.getKey()); + oprot.writeI64(_iter231.getValue()); } } } } { oprot.writeI32(struct.failed.size()); - for (Map.Entry> _iter222 : struct.failed.entrySet()) + for (Map.Entry> _iter232 : struct.failed.entrySet()) { - oprot.writeString(_iter222.getKey()); + oprot.writeString(_iter232.getKey()); { - oprot.writeI32(_iter222.getValue().size()); - for (Map.Entry _iter223 : _iter222.getValue().entrySet()) + oprot.writeI32(_iter232.getValue().size()); + for (Map.Entry _iter233 : _iter232.getValue().entrySet()) { - oprot.writeString(_iter223.getKey()); - oprot.writeI64(_iter223.getValue()); + oprot.writeString(_iter233.getKey()); + oprot.writeI64(_iter233.getValue()); } } } } { oprot.writeI32(struct.complete_ms_avg.size()); - for (Map.Entry> _iter224 : struct.complete_ms_avg.entrySet()) + for (Map.Entry> _iter234 : struct.complete_ms_avg.entrySet()) { - oprot.writeString(_iter224.getKey()); + oprot.writeString(_iter234.getKey()); { - oprot.writeI32(_iter224.getValue().size()); - for (Map.Entry _iter225 : _iter224.getValue().entrySet()) + oprot.writeI32(_iter234.getValue().size()); + for (Map.Entry _iter235 : _iter234.getValue().entrySet()) { - oprot.writeString(_iter225.getKey()); - oprot.writeDouble(_iter225.getValue()); + oprot.writeString(_iter235.getKey()); + oprot.writeDouble(_iter235.getValue()); } } } @@ -839,74 +839,74 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SpoutStats struct) public void read(org.apache.thrift.protocol.TProtocol prot, SpoutStats struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TMap _map226 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.acked = new HashMap>(2*_map226.size); - String _key227; - Map _val228; - for (int _i229 = 0; _i229 < _map226.size; ++_i229) + org.apache.thrift.protocol.TMap _map236 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.acked = new HashMap>(2*_map236.size); + String _key237; + Map _val238; + for (int _i239 = 0; _i239 < _map236.size; ++_i239) { - _key227 = iprot.readString(); + _key237 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map230 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val228 = new HashMap(2*_map230.size); - String _key231; - long _val232; - for (int _i233 = 0; _i233 < _map230.size; ++_i233) + org.apache.thrift.protocol.TMap _map240 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val238 = new HashMap(2*_map240.size); + String _key241; + long _val242; + for (int _i243 = 0; _i243 < _map240.size; ++_i243) { - _key231 = iprot.readString(); - _val232 = iprot.readI64(); - _val228.put(_key231, _val232); + _key241 = iprot.readString(); + _val242 = iprot.readI64(); + _val238.put(_key241, _val242); } } - struct.acked.put(_key227, _val228); + struct.acked.put(_key237, _val238); } } struct.set_acked_isSet(true); { - org.apache.thrift.protocol.TMap _map234 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.failed = new HashMap>(2*_map234.size); - String _key235; - Map _val236; - for (int _i237 = 0; _i237 < _map234.size; ++_i237) + org.apache.thrift.protocol.TMap _map244 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.failed = new HashMap>(2*_map244.size); + String _key245; + Map _val246; + for (int _i247 = 0; _i247 < _map244.size; ++_i247) { - _key235 = iprot.readString(); + _key245 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map238 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val236 = new HashMap(2*_map238.size); - String _key239; - long _val240; - for (int _i241 = 0; _i241 < _map238.size; ++_i241) + org.apache.thrift.protocol.TMap _map248 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val246 = new HashMap(2*_map248.size); + String _key249; + long _val250; + for (int _i251 = 0; _i251 < _map248.size; ++_i251) { - _key239 = iprot.readString(); - _val240 = iprot.readI64(); - _val236.put(_key239, _val240); + _key249 = iprot.readString(); + _val250 = iprot.readI64(); + _val246.put(_key249, _val250); } } - struct.failed.put(_key235, _val236); + struct.failed.put(_key245, _val246); } } struct.set_failed_isSet(true); { - org.apache.thrift.protocol.TMap _map242 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.complete_ms_avg = new HashMap>(2*_map242.size); - String _key243; - Map _val244; - for (int _i245 = 0; _i245 < _map242.size; ++_i245) + org.apache.thrift.protocol.TMap _map252 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.complete_ms_avg = new HashMap>(2*_map252.size); + String _key253; + Map _val254; + for (int _i255 = 0; _i255 < _map252.size; ++_i255) { - _key243 = iprot.readString(); + _key253 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map246 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); - _val244 = new HashMap(2*_map246.size); - String _key247; - double _val248; - for (int _i249 = 0; _i249 < _map246.size; ++_i249) + org.apache.thrift.protocol.TMap _map256 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + _val254 = new HashMap(2*_map256.size); + String _key257; + double _val258; + for (int _i259 = 0; _i259 < _map256.size; ++_i259) { - _key247 = iprot.readString(); - _val248 = iprot.readDouble(); - _val244.put(_key247, _val248); + _key257 = iprot.readString(); + _val258 = iprot.readDouble(); + _val254.put(_key257, _val258); } } - struct.complete_ms_avg.put(_key243, _val244); + struct.complete_ms_avg.put(_key253, _val254); } } struct.set_complete_ms_avg_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java index 15d34aedfb8..97f9e3e424f 100644 --- a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java +++ b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java @@ -51,7 +51,7 @@ 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-7-1") public class StateSpoutSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StateSpoutSpec"); diff --git a/storm-core/src/jvm/backtype/storm/generated/StormBase.java b/storm-core/src/jvm/backtype/storm/generated/StormBase.java index b00f0726117..0275240b7e7 100644 --- a/storm-core/src/jvm/backtype/storm/generated/StormBase.java +++ b/storm-core/src/jvm/backtype/storm/generated/StormBase.java @@ -51,7 +51,7 @@ 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-7-1") public class StormBase implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormBase"); @@ -984,15 +984,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, StormBase struct) t case 4: // COMPONENT_EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map416 = iprot.readMapBegin(); - struct.component_executors = new HashMap(2*_map416.size); - String _key417; - int _val418; - for (int _i419 = 0; _i419 < _map416.size; ++_i419) + org.apache.thrift.protocol.TMap _map436 = iprot.readMapBegin(); + struct.component_executors = new HashMap(2*_map436.size); + String _key437; + int _val438; + for (int _i439 = 0; _i439 < _map436.size; ++_i439) { - _key417 = iprot.readString(); - _val418 = iprot.readI32(); - struct.component_executors.put(_key417, _val418); + _key437 = iprot.readString(); + _val438 = iprot.readI32(); + struct.component_executors.put(_key437, _val438); } iprot.readMapEnd(); } @@ -1065,10 +1065,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, StormBase struct) oprot.writeFieldBegin(COMPONENT_EXECUTORS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.component_executors.size())); - for (Map.Entry _iter420 : struct.component_executors.entrySet()) + for (Map.Entry _iter440 : struct.component_executors.entrySet()) { - oprot.writeString(_iter420.getKey()); - oprot.writeI32(_iter420.getValue()); + oprot.writeString(_iter440.getKey()); + oprot.writeI32(_iter440.getValue()); } oprot.writeMapEnd(); } @@ -1141,10 +1141,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, StormBase struct) t if (struct.is_set_component_executors()) { { oprot.writeI32(struct.component_executors.size()); - for (Map.Entry _iter421 : struct.component_executors.entrySet()) + for (Map.Entry _iter441 : struct.component_executors.entrySet()) { - oprot.writeString(_iter421.getKey()); - oprot.writeI32(_iter421.getValue()); + oprot.writeString(_iter441.getKey()); + oprot.writeI32(_iter441.getValue()); } } } @@ -1174,15 +1174,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, StormBase struct) th BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map422 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.component_executors = new HashMap(2*_map422.size); - String _key423; - int _val424; - for (int _i425 = 0; _i425 < _map422.size; ++_i425) + org.apache.thrift.protocol.TMap _map442 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.component_executors = new HashMap(2*_map442.size); + String _key443; + int _val444; + for (int _i445 = 0; _i445 < _map442.size; ++_i445) { - _key423 = iprot.readString(); - _val424 = iprot.readI32(); - struct.component_executors.put(_key423, _val424); + _key443 = iprot.readString(); + _val444 = iprot.readI32(); + struct.component_executors.put(_key443, _val444); } } struct.set_component_executors_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java index d022e95d2ba..f9a653cc6f4 100644 --- a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java +++ b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java @@ -51,7 +51,7 @@ 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-7-1") public class StormTopology implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormTopology"); diff --git a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java index b9bc75d9108..5e6edf4cc22 100644 --- a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java @@ -51,7 +51,7 @@ 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-7-1") public class StreamInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StreamInfo"); diff --git a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java index 2a68c3bd0e8..a36ff824ee5 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java +++ b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java @@ -51,7 +51,7 @@ 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-7-1") public class SubmitOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SubmitOptions"); diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java index 9083b0d2b51..69c8298e25f 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-20") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-1") public class SupervisorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorInfo"); @@ -63,6 +63,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -78,6 +79,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase scheduler_meta; // optional private long uptime_secs; // optional private String version; // optional + private Map system_stats; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -88,7 +90,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { META((short)5, "meta"), SCHEDULER_META((short)6, "scheduler_meta"), UPTIME_SECS((short)7, "uptime_secs"), - VERSION((short)8, "version"); + VERSION((short)8, "version"), + SYSTEM_STATS((short)9, "system_stats"); private static final Map byName = new HashMap(); @@ -119,6 +122,8 @@ public static _Fields findByThriftId(int fieldId) { return UPTIME_SECS; case 8: // VERSION return VERSION; + case 9: // SYSTEM_STATS + return SYSTEM_STATS; default: return null; } @@ -162,7 +167,7 @@ public String getFieldName() { private static final int __TIME_SECS_ISSET_ID = 0; private static final int __UPTIME_SECS_ISSET_ID = 1; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.ASSIGNMENT_ID,_Fields.USED_PORTS,_Fields.META,_Fields.SCHEDULER_META,_Fields.UPTIME_SECS,_Fields.VERSION}; + private static final _Fields optionals[] = {_Fields.ASSIGNMENT_ID,_Fields.USED_PORTS,_Fields.META,_Fields.SCHEDULER_META,_Fields.UPTIME_SECS,_Fields.VERSION,_Fields.SYSTEM_STATS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -186,6 +191,10 @@ public String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.SYSTEM_STATS, new org.apache.thrift.meta_data.FieldMetaData("system_stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorInfo.class, metaDataMap); } @@ -231,6 +240,10 @@ public SupervisorInfo(SupervisorInfo other) { if (other.is_set_version()) { this.version = other.version; } + if (other.is_set_system_stats()) { + Map __this__system_stats = new HashMap(other.system_stats); + this.system_stats = __this__system_stats; + } } public SupervisorInfo deepCopy() { @@ -249,6 +262,7 @@ public void clear() { set_uptime_secs_isSet(false); this.uptime_secs = 0; this.version = null; + this.system_stats = null; } public long get_time_secs() { @@ -474,6 +488,40 @@ public void set_version_isSet(boolean value) { } } + public int get_system_stats_size() { + return (this.system_stats == null) ? 0 : this.system_stats.size(); + } + + public void put_to_system_stats(String key, double val) { + if (this.system_stats == null) { + this.system_stats = new HashMap(); + } + this.system_stats.put(key, val); + } + + public Map get_system_stats() { + return this.system_stats; + } + + public void set_system_stats(Map system_stats) { + this.system_stats = system_stats; + } + + public void unset_system_stats() { + this.system_stats = null; + } + + /** Returns true if field system_stats is set (has been assigned a value) and false otherwise */ + public boolean is_set_system_stats() { + return this.system_stats != null; + } + + public void set_system_stats_isSet(boolean value) { + if (!value) { + this.system_stats = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TIME_SECS: @@ -540,6 +588,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case SYSTEM_STATS: + if (value == null) { + unset_system_stats(); + } else { + set_system_stats((Map)value); + } + break; + } } @@ -569,6 +625,9 @@ public Object getFieldValue(_Fields field) { case VERSION: return get_version(); + case SYSTEM_STATS: + return get_system_stats(); + } throw new IllegalStateException(); } @@ -596,6 +655,8 @@ public boolean isSet(_Fields field) { return is_set_uptime_secs(); case VERSION: return is_set_version(); + case SYSTEM_STATS: + return is_set_system_stats(); } throw new IllegalStateException(); } @@ -685,6 +746,15 @@ public boolean equals(SupervisorInfo that) { return false; } + boolean this_present_system_stats = true && this.is_set_system_stats(); + boolean that_present_system_stats = true && that.is_set_system_stats(); + if (this_present_system_stats || that_present_system_stats) { + if (!(this_present_system_stats && that_present_system_stats)) + return false; + if (!this.system_stats.equals(that.system_stats)) + return false; + } + return true; } @@ -732,6 +802,11 @@ public int hashCode() { if (present_version) list.add(version); + boolean present_system_stats = true && (is_set_system_stats()); + list.add(present_system_stats); + if (present_system_stats) + list.add(system_stats); + return list.hashCode(); } @@ -823,6 +898,16 @@ public int compareTo(SupervisorInfo other) { return lastComparison; } } + lastComparison = Boolean.valueOf(is_set_system_stats()).compareTo(other.is_set_system_stats()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_system_stats()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.system_stats, other.system_stats); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -910,6 +995,16 @@ public String toString() { } first = false; } + if (is_set_system_stats()) { + if (!first) sb.append(", "); + sb.append("system_stats:"); + if (this.system_stats == null) { + sb.append("null"); + } else { + sb.append(this.system_stats); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -990,13 +1085,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo stru case 4: // USED_PORTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list336 = iprot.readListBegin(); - struct.used_ports = new ArrayList(_list336.size); - long _elem337; - for (int _i338 = 0; _i338 < _list336.size; ++_i338) + org.apache.thrift.protocol.TList _list346 = iprot.readListBegin(); + struct.used_ports = new ArrayList(_list346.size); + long _elem347; + for (int _i348 = 0; _i348 < _list346.size; ++_i348) { - _elem337 = iprot.readI64(); - struct.used_ports.add(_elem337); + _elem347 = iprot.readI64(); + struct.used_ports.add(_elem347); } iprot.readListEnd(); } @@ -1008,13 +1103,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo stru case 5: // META if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list339 = iprot.readListBegin(); - struct.meta = new ArrayList(_list339.size); - long _elem340; - for (int _i341 = 0; _i341 < _list339.size; ++_i341) + org.apache.thrift.protocol.TList _list349 = iprot.readListBegin(); + struct.meta = new ArrayList(_list349.size); + long _elem350; + for (int _i351 = 0; _i351 < _list349.size; ++_i351) { - _elem340 = iprot.readI64(); - struct.meta.add(_elem340); + _elem350 = iprot.readI64(); + struct.meta.add(_elem350); } iprot.readListEnd(); } @@ -1026,15 +1121,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo stru case 6: // SCHEDULER_META if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map342 = iprot.readMapBegin(); - struct.scheduler_meta = new HashMap(2*_map342.size); - String _key343; - String _val344; - for (int _i345 = 0; _i345 < _map342.size; ++_i345) + org.apache.thrift.protocol.TMap _map352 = iprot.readMapBegin(); + struct.scheduler_meta = new HashMap(2*_map352.size); + String _key353; + String _val354; + for (int _i355 = 0; _i355 < _map352.size; ++_i355) { - _key343 = iprot.readString(); - _val344 = iprot.readString(); - struct.scheduler_meta.put(_key343, _val344); + _key353 = iprot.readString(); + _val354 = iprot.readString(); + struct.scheduler_meta.put(_key353, _val354); } iprot.readMapEnd(); } @@ -1059,6 +1154,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo stru org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 9: // SYSTEM_STATS + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map356 = iprot.readMapBegin(); + struct.system_stats = new HashMap(2*_map356.size); + String _key357; + double _val358; + for (int _i359 = 0; _i359 < _map356.size; ++_i359) + { + _key357 = iprot.readString(); + _val358 = iprot.readDouble(); + struct.system_stats.put(_key357, _val358); + } + iprot.readMapEnd(); + } + struct.set_system_stats_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1092,9 +1207,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo str oprot.writeFieldBegin(USED_PORTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.used_ports.size())); - for (long _iter346 : struct.used_ports) + for (long _iter360 : struct.used_ports) { - oprot.writeI64(_iter346); + oprot.writeI64(_iter360); } oprot.writeListEnd(); } @@ -1106,9 +1221,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo str oprot.writeFieldBegin(META_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.meta.size())); - for (long _iter347 : struct.meta) + for (long _iter361 : struct.meta) { - oprot.writeI64(_iter347); + oprot.writeI64(_iter361); } oprot.writeListEnd(); } @@ -1120,10 +1235,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo str oprot.writeFieldBegin(SCHEDULER_META_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.scheduler_meta.size())); - for (Map.Entry _iter348 : struct.scheduler_meta.entrySet()) + for (Map.Entry _iter362 : struct.scheduler_meta.entrySet()) { - oprot.writeString(_iter348.getKey()); - oprot.writeString(_iter348.getValue()); + oprot.writeString(_iter362.getKey()); + oprot.writeString(_iter362.getValue()); } oprot.writeMapEnd(); } @@ -1142,6 +1257,21 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo str oprot.writeFieldEnd(); } } + if (struct.system_stats != null) { + if (struct.is_set_system_stats()) { + oprot.writeFieldBegin(SYSTEM_STATS_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.system_stats.size())); + for (Map.Entry _iter363 : struct.system_stats.entrySet()) + { + oprot.writeString(_iter363.getKey()); + oprot.writeDouble(_iter363.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1180,35 +1310,38 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo stru if (struct.is_set_version()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.is_set_system_stats()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.is_set_assignment_id()) { oprot.writeString(struct.assignment_id); } if (struct.is_set_used_ports()) { { oprot.writeI32(struct.used_ports.size()); - for (long _iter349 : struct.used_ports) + for (long _iter364 : struct.used_ports) { - oprot.writeI64(_iter349); + oprot.writeI64(_iter364); } } } if (struct.is_set_meta()) { { oprot.writeI32(struct.meta.size()); - for (long _iter350 : struct.meta) + for (long _iter365 : struct.meta) { - oprot.writeI64(_iter350); + oprot.writeI64(_iter365); } } } if (struct.is_set_scheduler_meta()) { { oprot.writeI32(struct.scheduler_meta.size()); - for (Map.Entry _iter351 : struct.scheduler_meta.entrySet()) + for (Map.Entry _iter366 : struct.scheduler_meta.entrySet()) { - oprot.writeString(_iter351.getKey()); - oprot.writeString(_iter351.getValue()); + oprot.writeString(_iter366.getKey()); + oprot.writeString(_iter366.getValue()); } } } @@ -1218,6 +1351,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo stru if (struct.is_set_version()) { oprot.writeString(struct.version); } + if (struct.is_set_system_stats()) { + { + oprot.writeI32(struct.system_stats.size()); + for (Map.Entry _iter367 : struct.system_stats.entrySet()) + { + oprot.writeString(_iter367.getKey()); + oprot.writeDouble(_iter367.getValue()); + } + } + } } @Override @@ -1227,48 +1370,48 @@ public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo struc struct.set_time_secs_isSet(true); struct.hostname = iprot.readString(); struct.set_hostname_isSet(true); - BitSet incoming = iprot.readBitSet(6); + BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.assignment_id = iprot.readString(); struct.set_assignment_id_isSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list352 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.used_ports = new ArrayList(_list352.size); - long _elem353; - for (int _i354 = 0; _i354 < _list352.size; ++_i354) + org.apache.thrift.protocol.TList _list368 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.used_ports = new ArrayList(_list368.size); + long _elem369; + for (int _i370 = 0; _i370 < _list368.size; ++_i370) { - _elem353 = iprot.readI64(); - struct.used_ports.add(_elem353); + _elem369 = iprot.readI64(); + struct.used_ports.add(_elem369); } } struct.set_used_ports_isSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list355 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.meta = new ArrayList(_list355.size); - long _elem356; - for (int _i357 = 0; _i357 < _list355.size; ++_i357) + org.apache.thrift.protocol.TList _list371 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.meta = new ArrayList(_list371.size); + long _elem372; + for (int _i373 = 0; _i373 < _list371.size; ++_i373) { - _elem356 = iprot.readI64(); - struct.meta.add(_elem356); + _elem372 = iprot.readI64(); + struct.meta.add(_elem372); } } struct.set_meta_isSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map358 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.scheduler_meta = new HashMap(2*_map358.size); - String _key359; - String _val360; - for (int _i361 = 0; _i361 < _map358.size; ++_i361) + org.apache.thrift.protocol.TMap _map374 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.scheduler_meta = new HashMap(2*_map374.size); + String _key375; + String _val376; + for (int _i377 = 0; _i377 < _map374.size; ++_i377) { - _key359 = iprot.readString(); - _val360 = iprot.readString(); - struct.scheduler_meta.put(_key359, _val360); + _key375 = iprot.readString(); + _val376 = iprot.readString(); + struct.scheduler_meta.put(_key375, _val376); } } struct.set_scheduler_meta_isSet(true); @@ -1281,6 +1424,21 @@ public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo struc struct.version = iprot.readString(); struct.set_version_isSet(true); } + if (incoming.get(6)) { + { + org.apache.thrift.protocol.TMap _map378 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + struct.system_stats = new HashMap(2*_map378.size); + String _key379; + double _val380; + for (int _i381 = 0; _i381 < _map378.size; ++_i381) + { + _key379 = iprot.readString(); + _val380 = iprot.readDouble(); + struct.system_stats.put(_key379, _val380); + } + } + struct.set_system_stats_isSet(true); + } } } diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java index 9bdf9f71d1a..e5da1420f81 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java +++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-20") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-1") public class SupervisorSummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorSummary"); @@ -61,6 +61,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -74,6 +75,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase system_stats; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -82,7 +84,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { NUM_WORKERS((short)3, "num_workers"), NUM_USED_WORKERS((short)4, "num_used_workers"), SUPERVISOR_ID((short)5, "supervisor_id"), - VERSION((short)6, "version"); + VERSION((short)6, "version"), + SYSTEM_STATS((short)7, "system_stats"); private static final Map byName = new HashMap(); @@ -109,6 +112,8 @@ public static _Fields findByThriftId(int fieldId) { return SUPERVISOR_ID; case 6: // VERSION return VERSION; + case 7: // SYSTEM_STATS + return SYSTEM_STATS; default: return null; } @@ -153,7 +158,7 @@ public String getFieldName() { private static final int __NUM_WORKERS_ISSET_ID = 1; private static final int __NUM_USED_WORKERS_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.VERSION}; + private static final _Fields optionals[] = {_Fields.VERSION,_Fields.SYSTEM_STATS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -169,6 +174,10 @@ public String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.SYSTEM_STATS, new org.apache.thrift.meta_data.FieldMetaData("system_stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap); } @@ -213,6 +222,10 @@ public SupervisorSummary(SupervisorSummary other) { if (other.is_set_version()) { this.version = other.version; } + if (other.is_set_system_stats()) { + Map __this__system_stats = new HashMap(other.system_stats); + this.system_stats = __this__system_stats; + } } public SupervisorSummary deepCopy() { @@ -231,6 +244,7 @@ public void clear() { this.supervisor_id = null; this.version = "VERSION_NOT_PROVIDED"; + this.system_stats = null; } public String get_host() { @@ -368,6 +382,40 @@ public void set_version_isSet(boolean value) { } } + public int get_system_stats_size() { + return (this.system_stats == null) ? 0 : this.system_stats.size(); + } + + public void put_to_system_stats(String key, double val) { + if (this.system_stats == null) { + this.system_stats = new HashMap(); + } + this.system_stats.put(key, val); + } + + public Map get_system_stats() { + return this.system_stats; + } + + public void set_system_stats(Map system_stats) { + this.system_stats = system_stats; + } + + public void unset_system_stats() { + this.system_stats = null; + } + + /** Returns true if field system_stats is set (has been assigned a value) and false otherwise */ + public boolean is_set_system_stats() { + return this.system_stats != null; + } + + public void set_system_stats_isSet(boolean value) { + if (!value) { + this.system_stats = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case HOST: @@ -418,6 +466,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case SYSTEM_STATS: + if (value == null) { + unset_system_stats(); + } else { + set_system_stats((Map)value); + } + break; + } } @@ -441,6 +497,9 @@ public Object getFieldValue(_Fields field) { case VERSION: return get_version(); + case SYSTEM_STATS: + return get_system_stats(); + } throw new IllegalStateException(); } @@ -464,6 +523,8 @@ public boolean isSet(_Fields field) { return is_set_supervisor_id(); case VERSION: return is_set_version(); + case SYSTEM_STATS: + return is_set_system_stats(); } throw new IllegalStateException(); } @@ -535,6 +596,15 @@ public boolean equals(SupervisorSummary that) { return false; } + boolean this_present_system_stats = true && this.is_set_system_stats(); + boolean that_present_system_stats = true && that.is_set_system_stats(); + if (this_present_system_stats || that_present_system_stats) { + if (!(this_present_system_stats && that_present_system_stats)) + return false; + if (!this.system_stats.equals(that.system_stats)) + return false; + } + return true; } @@ -572,6 +642,11 @@ public int hashCode() { if (present_version) list.add(version); + boolean present_system_stats = true && (is_set_system_stats()); + list.add(present_system_stats); + if (present_system_stats) + list.add(system_stats); + return list.hashCode(); } @@ -643,6 +718,16 @@ public int compareTo(SupervisorSummary other) { return lastComparison; } } + lastComparison = Boolean.valueOf(is_set_system_stats()).compareTo(other.is_set_system_stats()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_system_stats()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.system_stats, other.system_stats); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -700,6 +785,16 @@ public String toString() { } first = false; } + if (is_set_system_stats()) { + if (!first) sb.append(", "); + sb.append("system_stats:"); + if (this.system_stats == null) { + sb.append("null"); + } else { + sb.append(this.system_stats); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -813,6 +908,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorSummary s org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 7: // SYSTEM_STATS + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map74 = iprot.readMapBegin(); + struct.system_stats = new HashMap(2*_map74.size); + String _key75; + double _val76; + for (int _i77 = 0; _i77 < _map74.size; ++_i77) + { + _key75 = iprot.readString(); + _val76 = iprot.readDouble(); + struct.system_stats.put(_key75, _val76); + } + iprot.readMapEnd(); + } + struct.set_system_stats_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -852,6 +967,21 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorSummary oprot.writeFieldEnd(); } } + if (struct.system_stats != null) { + if (struct.is_set_system_stats()) { + oprot.writeFieldBegin(SYSTEM_STATS_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.system_stats.size())); + for (Map.Entry _iter78 : struct.system_stats.entrySet()) + { + oprot.writeString(_iter78.getKey()); + oprot.writeDouble(_iter78.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -878,10 +1008,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary s if (struct.is_set_version()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.is_set_system_stats()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.is_set_version()) { oprot.writeString(struct.version); } + if (struct.is_set_system_stats()) { + { + oprot.writeI32(struct.system_stats.size()); + for (Map.Entry _iter79 : struct.system_stats.entrySet()) + { + oprot.writeString(_iter79.getKey()); + oprot.writeDouble(_iter79.getValue()); + } + } + } } @Override @@ -897,11 +1040,26 @@ public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary st struct.set_num_used_workers_isSet(true); struct.supervisor_id = iprot.readString(); struct.set_supervisor_id_isSet(true); - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.version = iprot.readString(); struct.set_version_isSet(true); } + if (incoming.get(1)) { + { + org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + struct.system_stats = new HashMap(2*_map80.size); + String _key81; + double _val82; + for (int _i83 = 0; _i83 < _map80.size; ++_i83) + { + _key81 = iprot.readString(); + _val82 = iprot.readDouble(); + struct.system_stats.put(_key81, _val82); + } + } + struct.set_system_stats_isSet(true); + } } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java b/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java index 681066945c1..96692905d34 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java +++ b/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java @@ -51,7 +51,7 @@ 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-7-1") public class ThriftSerializedObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftSerializedObject"); diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java index 6e1a5032621..cea13ad880f 100644 --- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java @@ -51,7 +51,7 @@ 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-7-1") public class TopologyInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyInfo"); @@ -1012,14 +1012,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyInfo struct case 4: // EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list290 = iprot.readListBegin(); - struct.executors = new ArrayList(_list290.size); - ExecutorSummary _elem291; - for (int _i292 = 0; _i292 < _list290.size; ++_i292) + org.apache.thrift.protocol.TList _list300 = iprot.readListBegin(); + struct.executors = new ArrayList(_list300.size); + ExecutorSummary _elem301; + for (int _i302 = 0; _i302 < _list300.size; ++_i302) { - _elem291 = new ExecutorSummary(); - _elem291.read(iprot); - struct.executors.add(_elem291); + _elem301 = new ExecutorSummary(); + _elem301.read(iprot); + struct.executors.add(_elem301); } iprot.readListEnd(); } @@ -1039,26 +1039,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyInfo struct case 6: // ERRORS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map293 = iprot.readMapBegin(); - struct.errors = new HashMap>(2*_map293.size); - String _key294; - List _val295; - for (int _i296 = 0; _i296 < _map293.size; ++_i296) + org.apache.thrift.protocol.TMap _map303 = iprot.readMapBegin(); + struct.errors = new HashMap>(2*_map303.size); + String _key304; + List _val305; + for (int _i306 = 0; _i306 < _map303.size; ++_i306) { - _key294 = iprot.readString(); + _key304 = iprot.readString(); { - org.apache.thrift.protocol.TList _list297 = iprot.readListBegin(); - _val295 = new ArrayList(_list297.size); - ErrorInfo _elem298; - for (int _i299 = 0; _i299 < _list297.size; ++_i299) + org.apache.thrift.protocol.TList _list307 = iprot.readListBegin(); + _val305 = new ArrayList(_list307.size); + ErrorInfo _elem308; + for (int _i309 = 0; _i309 < _list307.size; ++_i309) { - _elem298 = new ErrorInfo(); - _elem298.read(iprot); - _val295.add(_elem298); + _elem308 = new ErrorInfo(); + _elem308.read(iprot); + _val305.add(_elem308); } iprot.readListEnd(); } - struct.errors.put(_key294, _val295); + struct.errors.put(_key304, _val305); } iprot.readMapEnd(); } @@ -1113,9 +1113,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyInfo struc oprot.writeFieldBegin(EXECUTORS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size())); - for (ExecutorSummary _iter300 : struct.executors) + for (ExecutorSummary _iter310 : struct.executors) { - _iter300.write(oprot); + _iter310.write(oprot); } oprot.writeListEnd(); } @@ -1130,14 +1130,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyInfo struc oprot.writeFieldBegin(ERRORS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.errors.size())); - for (Map.Entry> _iter301 : struct.errors.entrySet()) + for (Map.Entry> _iter311 : struct.errors.entrySet()) { - oprot.writeString(_iter301.getKey()); + oprot.writeString(_iter311.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter301.getValue().size())); - for (ErrorInfo _iter302 : _iter301.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter311.getValue().size())); + for (ErrorInfo _iter312 : _iter311.getValue()) { - _iter302.write(oprot); + _iter312.write(oprot); } oprot.writeListEnd(); } @@ -1182,22 +1182,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyInfo struct oprot.writeI32(struct.uptime_secs); { oprot.writeI32(struct.executors.size()); - for (ExecutorSummary _iter303 : struct.executors) + for (ExecutorSummary _iter313 : struct.executors) { - _iter303.write(oprot); + _iter313.write(oprot); } } oprot.writeString(struct.status); { oprot.writeI32(struct.errors.size()); - for (Map.Entry> _iter304 : struct.errors.entrySet()) + for (Map.Entry> _iter314 : struct.errors.entrySet()) { - oprot.writeString(_iter304.getKey()); + oprot.writeString(_iter314.getKey()); { - oprot.writeI32(_iter304.getValue().size()); - for (ErrorInfo _iter305 : _iter304.getValue()) + oprot.writeI32(_iter314.getValue().size()); + for (ErrorInfo _iter315 : _iter314.getValue()) { - _iter305.write(oprot); + _iter315.write(oprot); } } } @@ -1228,39 +1228,39 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TopologyInfo struct) struct.uptime_secs = iprot.readI32(); struct.set_uptime_secs_isSet(true); { - org.apache.thrift.protocol.TList _list306 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executors = new ArrayList(_list306.size); - ExecutorSummary _elem307; - for (int _i308 = 0; _i308 < _list306.size; ++_i308) + org.apache.thrift.protocol.TList _list316 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList(_list316.size); + ExecutorSummary _elem317; + for (int _i318 = 0; _i318 < _list316.size; ++_i318) { - _elem307 = new ExecutorSummary(); - _elem307.read(iprot); - struct.executors.add(_elem307); + _elem317 = new ExecutorSummary(); + _elem317.read(iprot); + struct.executors.add(_elem317); } } struct.set_executors_isSet(true); struct.status = iprot.readString(); struct.set_status_isSet(true); { - org.apache.thrift.protocol.TMap _map309 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); - struct.errors = new HashMap>(2*_map309.size); - String _key310; - List _val311; - for (int _i312 = 0; _i312 < _map309.size; ++_i312) + org.apache.thrift.protocol.TMap _map319 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); + struct.errors = new HashMap>(2*_map319.size); + String _key320; + List _val321; + for (int _i322 = 0; _i322 < _map319.size; ++_i322) { - _key310 = iprot.readString(); + _key320 = iprot.readString(); { - org.apache.thrift.protocol.TList _list313 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - _val311 = new ArrayList(_list313.size); - ErrorInfo _elem314; - for (int _i315 = 0; _i315 < _list313.size; ++_i315) + org.apache.thrift.protocol.TList _list323 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val321 = new ArrayList(_list323.size); + ErrorInfo _elem324; + for (int _i325 = 0; _i325 < _list323.size; ++_i325) { - _elem314 = new ErrorInfo(); - _elem314.read(iprot); - _val311.add(_elem314); + _elem324 = new ErrorInfo(); + _elem324.read(iprot); + _val321.add(_elem324); } } - struct.errors.put(_key310, _val311); + struct.errors.put(_key320, _val321); } } struct.set_errors_isSet(true); diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java index 386c8cee4ff..77a754d1205 100644 --- a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java +++ b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-1") public class TopologySummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologySummary"); diff --git a/storm-core/src/jvm/backtype/storm/metric/SystemBolt.java b/storm-core/src/jvm/backtype/storm/metric/SystemBolt.java index 492bc2da757..32f56b3fc3e 100644 --- a/storm-core/src/jvm/backtype/storm/metric/SystemBolt.java +++ b/storm-core/src/jvm/backtype/storm/metric/SystemBolt.java @@ -62,6 +62,26 @@ public Object getValueAndReset() { } } + private static class CPUUsageMetric implements IMetric { + + IFn _getUsage; + + public CPUUsageMetric(IFn getUsage) { _getUsage = getUsage; } + + @Override + public Object getValueAndReset() { + double cpuUtil = -1; + try { + com.sun.management.OperatingSystemMXBean osBean; + osBean = (com.sun.management.OperatingSystemMXBean)(OperatingSystemMXBean)_getUsage.invoke(); + cpuUtil = osBean.getProcessCpuLoad(); + } catch (Exception e) { + LOG.error("Unable to load com.sun.management: Returning -1 for CPU Util value", e); + } + return cpuUtil; + } + } + // canonically the metrics data exported is time bucketed when doing counts. // convert the absolute values here into time buckets. private static class GarbageCollectorMetric implements IMetric { @@ -142,6 +162,15 @@ public Object invoke() { for(GarbageCollectorMXBean b : ManagementFactory.getGarbageCollectorMXBeans()) { context.registerMetric("GC/" + b.getName().replaceAll("\\W", ""), new GarbageCollectorMetric(b), bucketSize); } + + final OperatingSystemMXBean osBean = ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class); + context.registerMetric("cpu/Util", new CPUUsageMetric(new AFn() { + @Override + public Object invoke() { + return osBean; + } + }), bucketSize); + } @Override diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java index d83b926c445..204adbc31e8 100644 --- a/storm-core/src/jvm/backtype/storm/utils/Utils.java +++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java @@ -40,7 +40,19 @@ import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStreamWriter; +import java.io.Serializable; +import java.lang.management.ManagementFactory; +import java.lang.management.OperatingSystemMXBean; import java.net.URL; import java.net.URLDecoder; import java.nio.ByteBuffer; @@ -48,7 +60,15 @@ import java.nio.channels.WritableByteChannel; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.UUID; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; @@ -98,10 +118,10 @@ public static T javaDeserialize(byte[] serialized, Class clazz) { ObjectInputStream ois = new ObjectInputStream(bis); Object ret = ois.readObject(); ois.close(); - return (T)ret; - } catch(IOException ioe) { + return (T) ret; + } catch (IOException ioe) { throw new RuntimeException(ioe); - } catch(ClassNotFoundException e) { + } catch (ClassNotFoundException e) { throw new RuntimeException(e); } } @@ -154,10 +174,10 @@ public static Map fromCompressedJsonConf(byte[] serialized) { InputStreamReader in = new InputStreamReader(new GZIPInputStream(bis)); Object ret = JSONValue.parseWithException(in); in.close(); - return (Map)ret; - } catch(IOException ioe) { + return (Map) ret; + } catch (IOException ioe) { throw new RuntimeException(ioe); - } catch(ParseException e) { + } catch (ParseException e) { throw new RuntimeException(e); } } @@ -165,9 +185,9 @@ public static Map fromCompressedJsonConf(byte[] serialized) { public static String join(Iterable coll, String sep) { Iterator it = coll.iterator(); String ret = ""; - while(it.hasNext()) { + while (it.hasNext()) { ret = ret + it.next(); - if(it.hasNext()) { + if (it.hasNext()) { ret = ret + sep; } } @@ -177,7 +197,7 @@ public static String join(Iterable coll, String sep) { public static void sleep(long millis) { try { Time.sleep(millis); - } catch(InterruptedException e) { + } catch (InterruptedException e) { throw new RuntimeException(e); } } @@ -186,11 +206,11 @@ public static List findResources(String name) { try { Enumeration resources = Thread.currentThread().getContextClassLoader().getResources(name); List ret = new ArrayList(); - while(resources.hasMoreElements()) { + while (resources.hasMoreElements()) { ret.add(resources.nextElement()); } return ret; - } catch(IOException e) { + } catch (IOException e) { throw new RuntimeException(e); } } @@ -211,7 +231,7 @@ public static Map findAndReadConfigFile(String name, boolean mustExist) { } if (mustExist) { - if(confFileEmpty) + if (confFileEmpty) throw new RuntimeException("Config file " + name + " doesn't have any valid storm configs"); else throw new RuntimeException("Could not find config file on classpath " + name); @@ -250,7 +270,7 @@ private static InputStream getConfigFileInputStream(String configFilePath) + " resources. You're probably bundling the Storm jars with your topology jar. " + resources); } else { - LOG.info("Using "+configFilePath+" from resources"); + LOG.info("Using " + configFilePath + " from resources"); URL resource = resources.iterator().next(); return resource.openStream(); } @@ -259,7 +279,7 @@ private static InputStream getConfigFileInputStream(String configFilePath) public static Map findAndReadConfigFile(String name) { - return findAndReadConfigFile(name, true); + return findAndReadConfigFile(name, true); } public static Map readDefaultConfig() { @@ -269,7 +289,7 @@ public static Map readDefaultConfig() { public static Map readCommandLineOpts() { Map ret = new HashMap(); String commandOptions = System.getProperty("storm.options"); - if(commandOptions != null) { + if (commandOptions != null) { String[] configs = commandOptions.split(","); for (String config : configs) { config = URLDecoder.decode(config); @@ -292,7 +312,7 @@ public static Map readStormConfig() { Map ret = readDefaultConfig(); String confFile = System.getProperty("storm.conf.file"); Map storm; - if (confFile==null || confFile.equals("")) { + if (confFile == null || confFile.equals("")) { storm = findAndReadConfigFile("storm.yaml", false); } else { storm = findAndReadConfigFile(confFile, true); @@ -303,24 +323,24 @@ public static Map readStormConfig() { } private static Object normalizeConf(Object conf) { - if(conf==null) return new HashMap(); - if(conf instanceof Map) { + if (conf == null) return new HashMap(); + if (conf instanceof Map) { Map confMap = new HashMap((Map) conf); - for(Object key: confMap.keySet()) { + for (Object key : confMap.keySet()) { Object val = confMap.get(key); confMap.put(key, normalizeConf(val)); } return confMap; - } else if(conf instanceof List) { - List confList = new ArrayList((List) conf); - for(int i=0; i stormConf) { } public static Object getSetComponentObject(ComponentObject obj) { - if(obj.getSetField()==ComponentObject._Fields.SERIALIZED_JAVA) { + if (obj.getSetField() == ComponentObject._Fields.SERIALIZED_JAVA) { return Utils.javaDeserialize(obj.get_serialized_java(), Serializable.class); - } else if(obj.getSetField()==ComponentObject._Fields.JAVA_OBJECT) { + } else if (obj.getSetField() == ComponentObject._Fields.JAVA_OBJECT) { return obj.get_java_object(); } else { return obj.get_shell(); @@ -343,7 +363,7 @@ public static Object getSetComponentObject(ComponentObject obj) { public static T get(Map m, S key, T def) { T ret = m.get(key); - if(ret==null) { + if (ret == null) { ret = def; } return ret; @@ -351,7 +371,7 @@ public static T get(Map m, S key, T def) { public static List tuple(Object... values) { List ret = new ArrayList(); - for(Object v: values) { + for (Object v : values) { ret.add(v); } return ret; @@ -361,19 +381,19 @@ public static void downloadFromMaster(Map conf, String file, String localFile) t NimbusClient client = NimbusClient.getConfiguredClient(conf); String id = client.getClient().beginFileDownload(file); WritableByteChannel out = Channels.newChannel(new FileOutputStream(localFile)); - while(true) { + while (true) { ByteBuffer chunk = client.getClient().downloadChunk(id); int written = out.write(chunk); - if(written==0) break; + if (written == 0) break; } out.close(); } public static IFn loadClojureFn(String namespace, String name) { try { - clojure.lang.Compiler.eval(RT.readString("(require '" + namespace + ")")); + clojure.lang.Compiler.eval(RT.readString("(require '" + namespace + ")")); } catch (Exception e) { - //if playing from the repl and defining functions, file won't exist + //if playing from the repl and defining functions, file won't exist } return (IFn) RT.var(namespace, name).deref(); } @@ -384,64 +404,64 @@ public static boolean isSystemId(String id) { public static Map reverseMap(Map map) { Map ret = new HashMap(); - for(K key: map.keySet()) { + for (K key : map.keySet()) { ret.put(map.get(key), key); } return ret; } public static ComponentCommon getComponentCommon(StormTopology topology, String id) { - if(topology.get_spouts().containsKey(id)) { + if (topology.get_spouts().containsKey(id)) { return topology.get_spouts().get(id).get_common(); } - if(topology.get_bolts().containsKey(id)) { + if (topology.get_bolts().containsKey(id)) { return topology.get_bolts().get(id).get_common(); } - if(topology.get_state_spouts().containsKey(id)) { + if (topology.get_state_spouts().containsKey(id)) { return topology.get_state_spouts().get(id).get_common(); } throw new IllegalArgumentException("Could not find component with id " + id); } public static Integer getInt(Object o) { - Integer result = getInt(o, null); - if (null == result) { - throw new IllegalArgumentException("Don't know how to convert null to int"); - } - return result; + Integer result = getInt(o, null); + if (null == result) { + throw new IllegalArgumentException("Don't know how to convert null to int"); + } + return result; } public static Integer getInt(Object o, Integer defaultValue) { - if (null == o) { - return defaultValue; - } - - if (o instanceof Integer || - o instanceof Short || - o instanceof Byte) { - return ((Number) o).intValue(); - } else if (o instanceof Long) { - final long l = (Long) o; - if (l <= Integer.MAX_VALUE && l >= Integer.MIN_VALUE) { - return (int) l; - } - } else if (o instanceof String) { - return Integer.parseInt((String) o); - } - - throw new IllegalArgumentException("Don't know how to convert " + o + " to int"); + if (null == o) { + return defaultValue; + } + + if (o instanceof Integer || + o instanceof Short || + o instanceof Byte) { + return ((Number) o).intValue(); + } else if (o instanceof Long) { + final long l = (Long) o; + if (l <= Integer.MAX_VALUE && l >= Integer.MIN_VALUE) { + return (int) l; + } + } else if (o instanceof String) { + return Integer.parseInt((String) o); + } + + throw new IllegalArgumentException("Don't know how to convert " + o + " to int"); } public static boolean getBoolean(Object o, boolean defaultValue) { - if (null == o) { - return defaultValue; - } + if (null == o) { + return defaultValue; + } - if(o instanceof Boolean) { - return (Boolean) o; - } else { - throw new IllegalArgumentException("Don't know how to convert " + o + " + to boolean"); - } + if (o instanceof Boolean) { + return (Boolean) o; + } else { + throw new IllegalArgumentException("Don't know how to convert " + o + " + to boolean"); + } } public static long secureRandomLong() { @@ -454,7 +474,7 @@ public static CuratorFramework newCurator(Map conf, List servers, Object public static CuratorFramework newCurator(Map conf, List servers, Object port, String root, ZookeeperAuthInfo auth) { List serverPorts = new ArrayList(); - for(String zkServer: (List) servers) { + for (String zkServer : (List) servers) { serverPorts.add(zkServer + ":" + Utils.getInt(port)); } String zkStr = StringUtils.join(serverPorts, ",") + root; @@ -465,17 +485,16 @@ public static CuratorFramework newCurator(Map conf, List servers, Object return builder.build(); } - protected static void setupBuilder(CuratorFrameworkFactory.Builder builder, String zkStr, Map conf, ZookeeperAuthInfo auth) - { + protected static void setupBuilder(CuratorFrameworkFactory.Builder builder, String zkStr, Map conf, ZookeeperAuthInfo auth) { builder.connectString(zkStr) - .connectionTimeoutMs(Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_CONNECTION_TIMEOUT))) - .sessionTimeoutMs(Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_SESSION_TIMEOUT))) - .retryPolicy(new StormBoundedExponentialBackoffRetry( + .connectionTimeoutMs(Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_CONNECTION_TIMEOUT))) + .sessionTimeoutMs(Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_SESSION_TIMEOUT))) + .retryPolicy(new StormBoundedExponentialBackoffRetry( Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_RETRY_INTERVAL)), Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_RETRY_INTERVAL_CEILING)), Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_RETRY_TIMES)))); - if(auth!=null && auth.scheme!=null && auth.payload!=null) { + if (auth != null && auth.scheme != null && auth.payload != null) { builder = builder.authorization(auth.scheme, auth.payload); } } @@ -497,15 +516,15 @@ public static CuratorFramework newCuratorStarted(Map conf, List servers, } /** + * (defn integer-divided [sum num-pieces] + * (let [base (int (/ sum num-pieces)) + * num-inc (mod sum num-pieces) + * num-bases (- num-pieces num-inc)] + * (if (= num-inc 0) + * {base num-bases} + * {base num-bases (inc base) num-inc} + * ))) * -(defn integer-divided [sum num-pieces] - (let [base (int (/ sum num-pieces)) - num-inc (mod sum num-pieces) - num-bases (- num-pieces num-inc)] - (if (= num-inc 0) - {base num-bases} - {base num-bases (inc base) num-inc} - ))) * @param sum * @param numPieces * @return @@ -517,8 +536,8 @@ public static TreeMap integerDivided(int sum, int numPieces) { int numBases = numPieces - numInc; TreeMap ret = new TreeMap(); ret.put(base, numBases); - if(numInc!=0) { - ret.put(base+1, numInc); + if (numInc != 0) { + ret.put(base + 1, numInc); } return ret; } @@ -533,7 +552,7 @@ public static void readAndLogStream(String prefix, InputStream in) { try { BufferedReader r = new BufferedReader(new InputStreamReader(in)); String line = null; - while ((line = r.readLine())!= null) { + while ((line = r.readLine()) != null) { LOG.info("{}:{}", prefix, line); } } catch (IOException e) { @@ -543,8 +562,8 @@ public static void readAndLogStream(String prefix, InputStream in) { public static boolean exceptionCauseIsInstanceOf(Class klass, Throwable throwable) { Throwable t = throwable; - while(t != null) { - if(klass.isInstance(t)) { + while (t != null) { + if (klass.isInstance(t)) { return true; } t = t.getCause(); @@ -555,25 +574,27 @@ public static boolean exceptionCauseIsInstanceOf(Class klass, Throwable throwabl /** * Is the cluster configured to interact with ZooKeeper in a secure way? * This only works when called from within Nimbus or a Supervisor process. + * * @param conf the storm configuration, not the topology configuration * @return true if it is configured else false. */ public static boolean isZkAuthenticationConfiguredStormServer(Map conf) { return null != System.getProperty("java.security.auth.login.config") - || (conf != null + || (conf != null && conf.get(Config.STORM_ZOOKEEPER_AUTH_SCHEME) != null - && ! ((String)conf.get(Config.STORM_ZOOKEEPER_AUTH_SCHEME)).isEmpty()); + && !((String) conf.get(Config.STORM_ZOOKEEPER_AUTH_SCHEME)).isEmpty()); } /** * Is the topology configured to have ZooKeeper authentication. + * * @param conf the topology configuration * @return true if ZK is configured else false */ public static boolean isZkAuthenticationConfiguredTopology(Map conf) { return (conf != null && conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME) != null - && ! ((String)conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME)).isEmpty()); + && !((String) conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME)).isEmpty()); } public static List getWorkerACL(Map conf) { @@ -581,43 +602,43 @@ public static List getWorkerACL(Map conf) { if (!isZkAuthenticationConfiguredTopology(conf)) { return null; } - String stormZKUser = (String)conf.get(Config.STORM_ZOOKEEPER_SUPERACL); + String stormZKUser = (String) conf.get(Config.STORM_ZOOKEEPER_SUPERACL); if (stormZKUser == null) { - throw new IllegalArgumentException("Authentication is enabled but "+Config.STORM_ZOOKEEPER_SUPERACL+" is not set"); + throw new IllegalArgumentException("Authentication is enabled but " + Config.STORM_ZOOKEEPER_SUPERACL + " is not set"); } - String[] split = stormZKUser.split(":",2); + String[] split = stormZKUser.split(":", 2); if (split.length != 2) { - throw new IllegalArgumentException(Config.STORM_ZOOKEEPER_SUPERACL+" does not appear to be in the form scheme:acl, i.e. sasl:storm-user"); + throw new IllegalArgumentException(Config.STORM_ZOOKEEPER_SUPERACL + " does not appear to be in the form scheme:acl, i.e. sasl:storm-user"); } ArrayList ret = new ArrayList(ZooDefs.Ids.CREATOR_ALL_ACL); ret.add(new ACL(ZooDefs.Perms.ALL, new Id(split[0], split[1]))); return ret; } - public static String threadDump() { - final StringBuilder dump = new StringBuilder(); - final java.lang.management.ThreadMXBean threadMXBean = java.lang.management.ManagementFactory.getThreadMXBean(); - final java.lang.management.ThreadInfo[] threadInfos = threadMXBean.getThreadInfo(threadMXBean.getAllThreadIds(), 100); - for (java.lang.management.ThreadInfo threadInfo : threadInfos) { - dump.append('"'); - dump.append(threadInfo.getThreadName()); - dump.append("\" "); - final Thread.State state = threadInfo.getThreadState(); - dump.append("\n java.lang.Thread.State: "); - dump.append(state); - final StackTraceElement[] stackTraceElements = threadInfo.getStackTrace(); - for (final StackTraceElement stackTraceElement : stackTraceElements) { - dump.append("\n at "); - dump.append(stackTraceElement); - } - dump.append("\n\n"); - } - return dump.toString(); - } + public static String threadDump() { + final StringBuilder dump = new StringBuilder(); + final java.lang.management.ThreadMXBean threadMXBean = java.lang.management.ManagementFactory.getThreadMXBean(); + final java.lang.management.ThreadInfo[] threadInfos = threadMXBean.getThreadInfo(threadMXBean.getAllThreadIds(), 100); + for (java.lang.management.ThreadInfo threadInfo : threadInfos) { + dump.append('"'); + dump.append(threadInfo.getThreadName()); + dump.append("\" "); + final Thread.State state = threadInfo.getThreadState(); + dump.append("\n java.lang.Thread.State: "); + dump.append(state); + final StackTraceElement[] stackTraceElements = threadInfo.getStackTrace(); + for (final StackTraceElement stackTraceElement : stackTraceElements) { + dump.append("\n at "); + dump.append(stackTraceElement); + } + dump.append("\n\n"); + } + return dump.toString(); + } // Assumes caller is synchronizing private static SerializationDelegate getSerializationDelegate(Map stormConf) { - String delegateClassName = (String)stormConf.get(Config.STORM_META_SERIALIZATION_DELEGATE); + String delegateClassName = (String) stormConf.get(Config.STORM_META_SERIALIZATION_DELEGATE); SerializationDelegate delegate; try { Class delegateClass = Class.forName(delegateClassName); @@ -636,20 +657,36 @@ private static SerializationDelegate getSerializationDelegate(Map stormConf) { return delegate; } - public static void handleUncaughtException(Throwable t) { - if (t != null && t instanceof Error) { - if (t instanceof OutOfMemoryError) { + public static void handleUncaughtException(Throwable t) { + if (t != null && t instanceof Error) { + if (t instanceof OutOfMemoryError) { + try { + System.err.println("Halting due to Out Of Memory Error..." + Thread.currentThread().getName()); + } catch (Throwable err) { + //Again we don't want to exit because of logging issues. + } + Runtime.getRuntime().halt(-1); + } else { + //Running in daemon mode, we would pass Error to calling thread. + throw (Error) t; + } + } + } + + public static double getCpuUtil() { + ClassLoader classLoader = Utils.class.getClassLoader(); + double cputUtil = -1; try { - System.err.println("Halting due to Out Of Memory Error..." + Thread.currentThread().getName()); - } catch (Throwable err) { - //Again we don't want to exit because of logging issues. + Class aClass = classLoader.loadClass("com.sun.management.OperatingSystemMXBean"); + OperatingSystemMXBean osBean = ManagementFactory.getOperatingSystemMXBean(); + if (osBean instanceof com.sun.management.OperatingSystemMXBean) { + com.sun.management.OperatingSystemMXBean osMxBean = (com.sun.management.OperatingSystemMXBean) osBean; + cputUtil = osMxBean.getProcessCpuLoad(); + } + } catch (ClassNotFoundException e) { + LOG.error("Unable to load com.sun.management: Returning -1 for CPU Util value", e); } - Runtime.getRuntime().halt(-1); - } else { - //Running in daemon mode, we would pass Error to calling thread. - throw (Error) t; - } + return cputUtil; } - } } diff --git a/storm-core/src/py/storm/ttypes.py b/storm-core/src/py/storm/ttypes.py index a06af926759..1b62c205745 100644 --- a/storm-core/src/py/storm/ttypes.py +++ b/storm-core/src/py/storm/ttypes.py @@ -2356,6 +2356,7 @@ class SupervisorSummary: - num_used_workers - supervisor_id - version + - system_stats """ thrift_spec = ( @@ -2365,16 +2366,18 @@ class SupervisorSummary: (3, TType.I32, 'num_workers', None, None, ), # 3 (4, TType.I32, 'num_used_workers', None, None, ), # 4 (5, TType.STRING, 'supervisor_id', None, None, ), # 5 - (6, TType.STRING, 'version', None, None, ), # 6 + (6, TType.STRING, 'version', None, "VERSION_NOT_PROVIDED", ), # 6 + (7, TType.MAP, 'system_stats', (TType.STRING,None,TType.DOUBLE,None), None, ), # 7 ) - def __init__(self, host=None, uptime_secs=None, num_workers=None, num_used_workers=None, supervisor_id=None, version=None,): + def __init__(self, host=None, uptime_secs=None, num_workers=None, num_used_workers=None, supervisor_id=None, version=thrift_spec[6][4], system_stats=None,): self.host = host self.uptime_secs = uptime_secs self.num_workers = num_workers self.num_used_workers = num_used_workers self.supervisor_id = supervisor_id self.version = version + self.system_stats = system_stats def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -2415,6 +2418,17 @@ def read(self, iprot): self.version = iprot.readString().decode('utf-8') else: iprot.skip(ftype) + elif fid == 7: + if ftype == TType.MAP: + self.system_stats = {} + (_ktype67, _vtype68, _size66 ) = iprot.readMapBegin() + for _i70 in xrange(_size66): + _key71 = iprot.readString().decode('utf-8') + _val72 = iprot.readDouble(); + self.system_stats[_key71] = _val72 + iprot.readMapEnd() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -2449,6 +2463,14 @@ def write(self, oprot): oprot.writeFieldBegin('version', TType.STRING, 6) oprot.writeString(self.version.encode('utf-8')) oprot.writeFieldEnd() + if self.system_stats is not None: + oprot.writeFieldBegin('system_stats', TType.MAP, 7) + oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(self.system_stats)) + for kiter73,viter74 in self.system_stats.items(): + oprot.writeString(kiter73.encode('utf-8')) + oprot.writeDouble(viter74) + oprot.writeMapEnd() + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -2463,8 +2485,6 @@ def validate(self): raise TProtocol.TProtocolException(message='Required field num_used_workers is unset!') if self.supervisor_id is None: raise TProtocol.TProtocolException(message='Required field supervisor_id is unset!') - if self.version is None: - raise TProtocol.TProtocolException(message='Required field version is unset!') return @@ -2476,6 +2496,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.num_used_workers) value = (value * 31) ^ hash(self.supervisor_id) value = (value * 31) ^ hash(self.version) + value = (value * 31) ^ hash(self.system_stats) return value def __repr__(self): @@ -2521,11 +2542,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.supervisors = [] - (_etype69, _size66) = iprot.readListBegin() - for _i70 in xrange(_size66): - _elem71 = SupervisorSummary() - _elem71.read(iprot) - self.supervisors.append(_elem71) + (_etype78, _size75) = iprot.readListBegin() + for _i79 in xrange(_size75): + _elem80 = SupervisorSummary() + _elem80.read(iprot) + self.supervisors.append(_elem80) iprot.readListEnd() else: iprot.skip(ftype) @@ -2537,11 +2558,11 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.topologies = [] - (_etype75, _size72) = iprot.readListBegin() - for _i76 in xrange(_size72): - _elem77 = TopologySummary() - _elem77.read(iprot) - self.topologies.append(_elem77) + (_etype84, _size81) = iprot.readListBegin() + for _i85 in xrange(_size81): + _elem86 = TopologySummary() + _elem86.read(iprot) + self.topologies.append(_elem86) iprot.readListEnd() else: iprot.skip(ftype) @@ -2558,8 +2579,8 @@ def write(self, oprot): if self.supervisors is not None: oprot.writeFieldBegin('supervisors', TType.LIST, 1) oprot.writeListBegin(TType.STRUCT, len(self.supervisors)) - for iter78 in self.supervisors: - iter78.write(oprot) + for iter87 in self.supervisors: + iter87.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.nimbus_uptime_secs is not None: @@ -2569,8 +2590,8 @@ def write(self, oprot): if self.topologies is not None: oprot.writeFieldBegin('topologies', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.topologies)) - for iter79 in self.topologies: - iter79.write(oprot) + for iter88 in self.topologies: + iter88.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -2750,90 +2771,90 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.acked = {} - (_ktype81, _vtype82, _size80 ) = iprot.readMapBegin() - for _i84 in xrange(_size80): - _key85 = iprot.readString().decode('utf-8') - _val86 = {} - (_ktype88, _vtype89, _size87 ) = iprot.readMapBegin() - for _i91 in xrange(_size87): - _key92 = GlobalStreamId() - _key92.read(iprot) - _val93 = iprot.readI64(); - _val86[_key92] = _val93 + (_ktype90, _vtype91, _size89 ) = iprot.readMapBegin() + for _i93 in xrange(_size89): + _key94 = iprot.readString().decode('utf-8') + _val95 = {} + (_ktype97, _vtype98, _size96 ) = iprot.readMapBegin() + for _i100 in xrange(_size96): + _key101 = GlobalStreamId() + _key101.read(iprot) + _val102 = iprot.readI64(); + _val95[_key101] = _val102 iprot.readMapEnd() - self.acked[_key85] = _val86 + self.acked[_key94] = _val95 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.MAP: self.failed = {} - (_ktype95, _vtype96, _size94 ) = iprot.readMapBegin() - for _i98 in xrange(_size94): - _key99 = iprot.readString().decode('utf-8') - _val100 = {} - (_ktype102, _vtype103, _size101 ) = iprot.readMapBegin() - for _i105 in xrange(_size101): - _key106 = GlobalStreamId() - _key106.read(iprot) - _val107 = iprot.readI64(); - _val100[_key106] = _val107 + (_ktype104, _vtype105, _size103 ) = iprot.readMapBegin() + for _i107 in xrange(_size103): + _key108 = iprot.readString().decode('utf-8') + _val109 = {} + (_ktype111, _vtype112, _size110 ) = iprot.readMapBegin() + for _i114 in xrange(_size110): + _key115 = GlobalStreamId() + _key115.read(iprot) + _val116 = iprot.readI64(); + _val109[_key115] = _val116 iprot.readMapEnd() - self.failed[_key99] = _val100 + self.failed[_key108] = _val109 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.process_ms_avg = {} - (_ktype109, _vtype110, _size108 ) = iprot.readMapBegin() - for _i112 in xrange(_size108): - _key113 = iprot.readString().decode('utf-8') - _val114 = {} - (_ktype116, _vtype117, _size115 ) = iprot.readMapBegin() - for _i119 in xrange(_size115): - _key120 = GlobalStreamId() - _key120.read(iprot) - _val121 = iprot.readDouble(); - _val114[_key120] = _val121 + (_ktype118, _vtype119, _size117 ) = iprot.readMapBegin() + for _i121 in xrange(_size117): + _key122 = iprot.readString().decode('utf-8') + _val123 = {} + (_ktype125, _vtype126, _size124 ) = iprot.readMapBegin() + for _i128 in xrange(_size124): + _key129 = GlobalStreamId() + _key129.read(iprot) + _val130 = iprot.readDouble(); + _val123[_key129] = _val130 iprot.readMapEnd() - self.process_ms_avg[_key113] = _val114 + self.process_ms_avg[_key122] = _val123 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.MAP: self.executed = {} - (_ktype123, _vtype124, _size122 ) = iprot.readMapBegin() - for _i126 in xrange(_size122): - _key127 = iprot.readString().decode('utf-8') - _val128 = {} - (_ktype130, _vtype131, _size129 ) = iprot.readMapBegin() - for _i133 in xrange(_size129): - _key134 = GlobalStreamId() - _key134.read(iprot) - _val135 = iprot.readI64(); - _val128[_key134] = _val135 + (_ktype132, _vtype133, _size131 ) = iprot.readMapBegin() + for _i135 in xrange(_size131): + _key136 = iprot.readString().decode('utf-8') + _val137 = {} + (_ktype139, _vtype140, _size138 ) = iprot.readMapBegin() + for _i142 in xrange(_size138): + _key143 = GlobalStreamId() + _key143.read(iprot) + _val144 = iprot.readI64(); + _val137[_key143] = _val144 iprot.readMapEnd() - self.executed[_key127] = _val128 + self.executed[_key136] = _val137 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.MAP: self.execute_ms_avg = {} - (_ktype137, _vtype138, _size136 ) = iprot.readMapBegin() - for _i140 in xrange(_size136): - _key141 = iprot.readString().decode('utf-8') - _val142 = {} - (_ktype144, _vtype145, _size143 ) = iprot.readMapBegin() - for _i147 in xrange(_size143): - _key148 = GlobalStreamId() - _key148.read(iprot) - _val149 = iprot.readDouble(); - _val142[_key148] = _val149 + (_ktype146, _vtype147, _size145 ) = iprot.readMapBegin() + for _i149 in xrange(_size145): + _key150 = iprot.readString().decode('utf-8') + _val151 = {} + (_ktype153, _vtype154, _size152 ) = iprot.readMapBegin() + for _i156 in xrange(_size152): + _key157 = GlobalStreamId() + _key157.read(iprot) + _val158 = iprot.readDouble(); + _val151[_key157] = _val158 iprot.readMapEnd() - self.execute_ms_avg[_key141] = _val142 + self.execute_ms_avg[_key150] = _val151 iprot.readMapEnd() else: iprot.skip(ftype) @@ -2850,60 +2871,60 @@ def write(self, oprot): if self.acked is not None: oprot.writeFieldBegin('acked', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.acked)) - for kiter150,viter151 in self.acked.items(): - oprot.writeString(kiter150.encode('utf-8')) - oprot.writeMapBegin(TType.STRUCT, TType.I64, len(viter151)) - for kiter152,viter153 in viter151.items(): - kiter152.write(oprot) - oprot.writeI64(viter153) + for kiter159,viter160 in self.acked.items(): + oprot.writeString(kiter159.encode('utf-8')) + oprot.writeMapBegin(TType.STRUCT, TType.I64, len(viter160)) + for kiter161,viter162 in viter160.items(): + kiter161.write(oprot) + oprot.writeI64(viter162) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.failed is not None: oprot.writeFieldBegin('failed', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.failed)) - for kiter154,viter155 in self.failed.items(): - oprot.writeString(kiter154.encode('utf-8')) - oprot.writeMapBegin(TType.STRUCT, TType.I64, len(viter155)) - for kiter156,viter157 in viter155.items(): - kiter156.write(oprot) - oprot.writeI64(viter157) + for kiter163,viter164 in self.failed.items(): + oprot.writeString(kiter163.encode('utf-8')) + oprot.writeMapBegin(TType.STRUCT, TType.I64, len(viter164)) + for kiter165,viter166 in viter164.items(): + kiter165.write(oprot) + oprot.writeI64(viter166) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.process_ms_avg is not None: oprot.writeFieldBegin('process_ms_avg', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.process_ms_avg)) - for kiter158,viter159 in self.process_ms_avg.items(): - oprot.writeString(kiter158.encode('utf-8')) - oprot.writeMapBegin(TType.STRUCT, TType.DOUBLE, len(viter159)) - for kiter160,viter161 in viter159.items(): - kiter160.write(oprot) - oprot.writeDouble(viter161) + for kiter167,viter168 in self.process_ms_avg.items(): + oprot.writeString(kiter167.encode('utf-8')) + oprot.writeMapBegin(TType.STRUCT, TType.DOUBLE, len(viter168)) + for kiter169,viter170 in viter168.items(): + kiter169.write(oprot) + oprot.writeDouble(viter170) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.executed is not None: oprot.writeFieldBegin('executed', TType.MAP, 4) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.executed)) - for kiter162,viter163 in self.executed.items(): - oprot.writeString(kiter162.encode('utf-8')) - oprot.writeMapBegin(TType.STRUCT, TType.I64, len(viter163)) - for kiter164,viter165 in viter163.items(): - kiter164.write(oprot) - oprot.writeI64(viter165) + for kiter171,viter172 in self.executed.items(): + oprot.writeString(kiter171.encode('utf-8')) + oprot.writeMapBegin(TType.STRUCT, TType.I64, len(viter172)) + for kiter173,viter174 in viter172.items(): + kiter173.write(oprot) + oprot.writeI64(viter174) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.execute_ms_avg is not None: oprot.writeFieldBegin('execute_ms_avg', TType.MAP, 5) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.execute_ms_avg)) - for kiter166,viter167 in self.execute_ms_avg.items(): - oprot.writeString(kiter166.encode('utf-8')) - oprot.writeMapBegin(TType.STRUCT, TType.DOUBLE, len(viter167)) - for kiter168,viter169 in viter167.items(): - kiter168.write(oprot) - oprot.writeDouble(viter169) + for kiter175,viter176 in self.execute_ms_avg.items(): + oprot.writeString(kiter175.encode('utf-8')) + oprot.writeMapBegin(TType.STRUCT, TType.DOUBLE, len(viter176)) + for kiter177,viter178 in viter176.items(): + kiter177.write(oprot) + oprot.writeDouble(viter178) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -2976,51 +2997,51 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.acked = {} - (_ktype171, _vtype172, _size170 ) = iprot.readMapBegin() - for _i174 in xrange(_size170): - _key175 = iprot.readString().decode('utf-8') - _val176 = {} - (_ktype178, _vtype179, _size177 ) = iprot.readMapBegin() - for _i181 in xrange(_size177): - _key182 = iprot.readString().decode('utf-8') - _val183 = iprot.readI64(); - _val176[_key182] = _val183 + (_ktype180, _vtype181, _size179 ) = iprot.readMapBegin() + for _i183 in xrange(_size179): + _key184 = iprot.readString().decode('utf-8') + _val185 = {} + (_ktype187, _vtype188, _size186 ) = iprot.readMapBegin() + for _i190 in xrange(_size186): + _key191 = iprot.readString().decode('utf-8') + _val192 = iprot.readI64(); + _val185[_key191] = _val192 iprot.readMapEnd() - self.acked[_key175] = _val176 + self.acked[_key184] = _val185 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.MAP: self.failed = {} - (_ktype185, _vtype186, _size184 ) = iprot.readMapBegin() - for _i188 in xrange(_size184): - _key189 = iprot.readString().decode('utf-8') - _val190 = {} - (_ktype192, _vtype193, _size191 ) = iprot.readMapBegin() - for _i195 in xrange(_size191): - _key196 = iprot.readString().decode('utf-8') - _val197 = iprot.readI64(); - _val190[_key196] = _val197 + (_ktype194, _vtype195, _size193 ) = iprot.readMapBegin() + for _i197 in xrange(_size193): + _key198 = iprot.readString().decode('utf-8') + _val199 = {} + (_ktype201, _vtype202, _size200 ) = iprot.readMapBegin() + for _i204 in xrange(_size200): + _key205 = iprot.readString().decode('utf-8') + _val206 = iprot.readI64(); + _val199[_key205] = _val206 iprot.readMapEnd() - self.failed[_key189] = _val190 + self.failed[_key198] = _val199 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.complete_ms_avg = {} - (_ktype199, _vtype200, _size198 ) = iprot.readMapBegin() - for _i202 in xrange(_size198): - _key203 = iprot.readString().decode('utf-8') - _val204 = {} - (_ktype206, _vtype207, _size205 ) = iprot.readMapBegin() - for _i209 in xrange(_size205): - _key210 = iprot.readString().decode('utf-8') - _val211 = iprot.readDouble(); - _val204[_key210] = _val211 + (_ktype208, _vtype209, _size207 ) = iprot.readMapBegin() + for _i211 in xrange(_size207): + _key212 = iprot.readString().decode('utf-8') + _val213 = {} + (_ktype215, _vtype216, _size214 ) = iprot.readMapBegin() + for _i218 in xrange(_size214): + _key219 = iprot.readString().decode('utf-8') + _val220 = iprot.readDouble(); + _val213[_key219] = _val220 iprot.readMapEnd() - self.complete_ms_avg[_key203] = _val204 + self.complete_ms_avg[_key212] = _val213 iprot.readMapEnd() else: iprot.skip(ftype) @@ -3037,36 +3058,36 @@ def write(self, oprot): if self.acked is not None: oprot.writeFieldBegin('acked', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.acked)) - for kiter212,viter213 in self.acked.items(): - oprot.writeString(kiter212.encode('utf-8')) - oprot.writeMapBegin(TType.STRING, TType.I64, len(viter213)) - for kiter214,viter215 in viter213.items(): - oprot.writeString(kiter214.encode('utf-8')) - oprot.writeI64(viter215) + for kiter221,viter222 in self.acked.items(): + oprot.writeString(kiter221.encode('utf-8')) + oprot.writeMapBegin(TType.STRING, TType.I64, len(viter222)) + for kiter223,viter224 in viter222.items(): + oprot.writeString(kiter223.encode('utf-8')) + oprot.writeI64(viter224) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.failed is not None: oprot.writeFieldBegin('failed', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.failed)) - for kiter216,viter217 in self.failed.items(): - oprot.writeString(kiter216.encode('utf-8')) - oprot.writeMapBegin(TType.STRING, TType.I64, len(viter217)) - for kiter218,viter219 in viter217.items(): - oprot.writeString(kiter218.encode('utf-8')) - oprot.writeI64(viter219) + for kiter225,viter226 in self.failed.items(): + oprot.writeString(kiter225.encode('utf-8')) + oprot.writeMapBegin(TType.STRING, TType.I64, len(viter226)) + for kiter227,viter228 in viter226.items(): + oprot.writeString(kiter227.encode('utf-8')) + oprot.writeI64(viter228) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.complete_ms_avg is not None: oprot.writeFieldBegin('complete_ms_avg', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.complete_ms_avg)) - for kiter220,viter221 in self.complete_ms_avg.items(): - oprot.writeString(kiter220.encode('utf-8')) - oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(viter221)) - for kiter222,viter223 in viter221.items(): - oprot.writeString(kiter222.encode('utf-8')) - oprot.writeDouble(viter223) + for kiter229,viter230 in self.complete_ms_avg.items(): + oprot.writeString(kiter229.encode('utf-8')) + oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(viter230)) + for kiter231,viter232 in viter230.items(): + oprot.writeString(kiter231.encode('utf-8')) + oprot.writeDouble(viter232) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -3216,34 +3237,34 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.emitted = {} - (_ktype225, _vtype226, _size224 ) = iprot.readMapBegin() - for _i228 in xrange(_size224): - _key229 = iprot.readString().decode('utf-8') - _val230 = {} - (_ktype232, _vtype233, _size231 ) = iprot.readMapBegin() - for _i235 in xrange(_size231): - _key236 = iprot.readString().decode('utf-8') - _val237 = iprot.readI64(); - _val230[_key236] = _val237 + (_ktype234, _vtype235, _size233 ) = iprot.readMapBegin() + for _i237 in xrange(_size233): + _key238 = iprot.readString().decode('utf-8') + _val239 = {} + (_ktype241, _vtype242, _size240 ) = iprot.readMapBegin() + for _i244 in xrange(_size240): + _key245 = iprot.readString().decode('utf-8') + _val246 = iprot.readI64(); + _val239[_key245] = _val246 iprot.readMapEnd() - self.emitted[_key229] = _val230 + self.emitted[_key238] = _val239 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.MAP: self.transferred = {} - (_ktype239, _vtype240, _size238 ) = iprot.readMapBegin() - for _i242 in xrange(_size238): - _key243 = iprot.readString().decode('utf-8') - _val244 = {} - (_ktype246, _vtype247, _size245 ) = iprot.readMapBegin() - for _i249 in xrange(_size245): - _key250 = iprot.readString().decode('utf-8') - _val251 = iprot.readI64(); - _val244[_key250] = _val251 + (_ktype248, _vtype249, _size247 ) = iprot.readMapBegin() + for _i251 in xrange(_size247): + _key252 = iprot.readString().decode('utf-8') + _val253 = {} + (_ktype255, _vtype256, _size254 ) = iprot.readMapBegin() + for _i258 in xrange(_size254): + _key259 = iprot.readString().decode('utf-8') + _val260 = iprot.readI64(); + _val253[_key259] = _val260 iprot.readMapEnd() - self.transferred[_key243] = _val244 + self.transferred[_key252] = _val253 iprot.readMapEnd() else: iprot.skip(ftype) @@ -3271,24 +3292,24 @@ def write(self, oprot): if self.emitted is not None: oprot.writeFieldBegin('emitted', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.emitted)) - for kiter252,viter253 in self.emitted.items(): - oprot.writeString(kiter252.encode('utf-8')) - oprot.writeMapBegin(TType.STRING, TType.I64, len(viter253)) - for kiter254,viter255 in viter253.items(): - oprot.writeString(kiter254.encode('utf-8')) - oprot.writeI64(viter255) + for kiter261,viter262 in self.emitted.items(): + oprot.writeString(kiter261.encode('utf-8')) + oprot.writeMapBegin(TType.STRING, TType.I64, len(viter262)) + for kiter263,viter264 in viter262.items(): + oprot.writeString(kiter263.encode('utf-8')) + oprot.writeI64(viter264) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.transferred is not None: oprot.writeFieldBegin('transferred', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.transferred)) - for kiter256,viter257 in self.transferred.items(): - oprot.writeString(kiter256.encode('utf-8')) - oprot.writeMapBegin(TType.STRING, TType.I64, len(viter257)) - for kiter258,viter259 in viter257.items(): - oprot.writeString(kiter258.encode('utf-8')) - oprot.writeI64(viter259) + for kiter265,viter266 in self.transferred.items(): + oprot.writeString(kiter265.encode('utf-8')) + oprot.writeMapBegin(TType.STRING, TType.I64, len(viter266)) + for kiter267,viter268 in viter266.items(): + oprot.writeString(kiter267.encode('utf-8')) + oprot.writeI64(viter268) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -4127,11 +4148,11 @@ def read(self, iprot): elif fid == 4: if ftype == TType.LIST: self.executors = [] - (_etype263, _size260) = iprot.readListBegin() - for _i264 in xrange(_size260): - _elem265 = ExecutorSummary() - _elem265.read(iprot) - self.executors.append(_elem265) + (_etype272, _size269) = iprot.readListBegin() + for _i273 in xrange(_size269): + _elem274 = ExecutorSummary() + _elem274.read(iprot) + self.executors.append(_elem274) iprot.readListEnd() else: iprot.skip(ftype) @@ -4143,17 +4164,17 @@ def read(self, iprot): elif fid == 6: if ftype == TType.MAP: self.errors = {} - (_ktype267, _vtype268, _size266 ) = iprot.readMapBegin() - for _i270 in xrange(_size266): - _key271 = iprot.readString().decode('utf-8') - _val272 = [] - (_etype276, _size273) = iprot.readListBegin() - for _i277 in xrange(_size273): - _elem278 = ErrorInfo() - _elem278.read(iprot) - _val272.append(_elem278) + (_ktype276, _vtype277, _size275 ) = iprot.readMapBegin() + for _i279 in xrange(_size275): + _key280 = iprot.readString().decode('utf-8') + _val281 = [] + (_etype285, _size282) = iprot.readListBegin() + for _i286 in xrange(_size282): + _elem287 = ErrorInfo() + _elem287.read(iprot) + _val281.append(_elem287) iprot.readListEnd() - self.errors[_key271] = _val272 + self.errors[_key280] = _val281 iprot.readMapEnd() else: iprot.skip(ftype) @@ -4192,8 +4213,8 @@ def write(self, oprot): if self.executors is not None: oprot.writeFieldBegin('executors', TType.LIST, 4) oprot.writeListBegin(TType.STRUCT, len(self.executors)) - for iter279 in self.executors: - iter279.write(oprot) + for iter288 in self.executors: + iter288.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.status is not None: @@ -4203,11 +4224,11 @@ def write(self, oprot): if self.errors is not None: oprot.writeFieldBegin('errors', TType.MAP, 6) oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.errors)) - for kiter280,viter281 in self.errors.items(): - oprot.writeString(kiter280.encode('utf-8')) - oprot.writeListBegin(TType.STRUCT, len(viter281)) - for iter282 in viter281: - iter282.write(oprot) + for kiter289,viter290 in self.errors.items(): + oprot.writeString(kiter289.encode('utf-8')) + oprot.writeListBegin(TType.STRUCT, len(viter290)) + for iter291 in viter290: + iter291.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -4368,11 +4389,11 @@ def read(self, iprot): elif fid == 3: if ftype == TType.MAP: self.num_executors = {} - (_ktype284, _vtype285, _size283 ) = iprot.readMapBegin() - for _i287 in xrange(_size283): - _key288 = iprot.readString().decode('utf-8') - _val289 = iprot.readI32(); - self.num_executors[_key288] = _val289 + (_ktype293, _vtype294, _size292 ) = iprot.readMapBegin() + for _i296 in xrange(_size292): + _key297 = iprot.readString().decode('utf-8') + _val298 = iprot.readI32(); + self.num_executors[_key297] = _val298 iprot.readMapEnd() else: iprot.skip(ftype) @@ -4397,9 +4418,9 @@ def write(self, oprot): if self.num_executors is not None: oprot.writeFieldBegin('num_executors', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.num_executors)) - for kiter290,viter291 in self.num_executors.items(): - oprot.writeString(kiter290.encode('utf-8')) - oprot.writeI32(viter291) + for kiter299,viter300 in self.num_executors.items(): + oprot.writeString(kiter299.encode('utf-8')) + oprot.writeI32(viter300) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -4453,11 +4474,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.creds = {} - (_ktype293, _vtype294, _size292 ) = iprot.readMapBegin() - for _i296 in xrange(_size292): - _key297 = iprot.readString().decode('utf-8') - _val298 = iprot.readString().decode('utf-8') - self.creds[_key297] = _val298 + (_ktype302, _vtype303, _size301 ) = iprot.readMapBegin() + for _i305 in xrange(_size301): + _key306 = iprot.readString().decode('utf-8') + _val307 = iprot.readString().decode('utf-8') + self.creds[_key306] = _val307 iprot.readMapEnd() else: iprot.skip(ftype) @@ -4474,9 +4495,9 @@ def write(self, oprot): if self.creds is not None: oprot.writeFieldBegin('creds', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.creds)) - for kiter299,viter300 in self.creds.items(): - oprot.writeString(kiter299.encode('utf-8')) - oprot.writeString(viter300.encode('utf-8')) + for kiter308,viter309 in self.creds.items(): + oprot.writeString(kiter308.encode('utf-8')) + oprot.writeString(viter309.encode('utf-8')) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -4596,6 +4617,7 @@ class SupervisorInfo: - scheduler_meta - uptime_secs - version + - system_stats """ thrift_spec = ( @@ -4608,9 +4630,10 @@ class SupervisorInfo: (6, TType.MAP, 'scheduler_meta', (TType.STRING,None,TType.STRING,None), None, ), # 6 (7, TType.I64, 'uptime_secs', None, None, ), # 7 (8, TType.STRING, 'version', None, None, ), # 8 + (9, TType.MAP, 'system_stats', (TType.STRING,None,TType.DOUBLE,None), None, ), # 9 ) - def __init__(self, time_secs=None, hostname=None, assignment_id=None, used_ports=None, meta=None, scheduler_meta=None, uptime_secs=None, version=None,): + def __init__(self, time_secs=None, hostname=None, assignment_id=None, used_ports=None, meta=None, scheduler_meta=None, uptime_secs=None, version=None, system_stats=None,): self.time_secs = time_secs self.hostname = hostname self.assignment_id = assignment_id @@ -4619,6 +4642,7 @@ def __init__(self, time_secs=None, hostname=None, assignment_id=None, used_ports self.scheduler_meta = scheduler_meta self.uptime_secs = uptime_secs self.version = version + self.system_stats = system_stats def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -4647,31 +4671,31 @@ def read(self, iprot): elif fid == 4: if ftype == TType.LIST: self.used_ports = [] - (_etype304, _size301) = iprot.readListBegin() - for _i305 in xrange(_size301): - _elem306 = iprot.readI64(); - self.used_ports.append(_elem306) + (_etype313, _size310) = iprot.readListBegin() + for _i314 in xrange(_size310): + _elem315 = iprot.readI64(); + self.used_ports.append(_elem315) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.LIST: self.meta = [] - (_etype310, _size307) = iprot.readListBegin() - for _i311 in xrange(_size307): - _elem312 = iprot.readI64(); - self.meta.append(_elem312) + (_etype319, _size316) = iprot.readListBegin() + for _i320 in xrange(_size316): + _elem321 = iprot.readI64(); + self.meta.append(_elem321) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 6: if ftype == TType.MAP: self.scheduler_meta = {} - (_ktype314, _vtype315, _size313 ) = iprot.readMapBegin() - for _i317 in xrange(_size313): - _key318 = iprot.readString().decode('utf-8') - _val319 = iprot.readString().decode('utf-8') - self.scheduler_meta[_key318] = _val319 + (_ktype323, _vtype324, _size322 ) = iprot.readMapBegin() + for _i326 in xrange(_size322): + _key327 = iprot.readString().decode('utf-8') + _val328 = iprot.readString().decode('utf-8') + self.scheduler_meta[_key327] = _val328 iprot.readMapEnd() else: iprot.skip(ftype) @@ -4685,6 +4709,17 @@ def read(self, iprot): self.version = iprot.readString().decode('utf-8') else: iprot.skip(ftype) + elif fid == 9: + if ftype == TType.MAP: + self.system_stats = {} + (_ktype330, _vtype331, _size329 ) = iprot.readMapBegin() + for _i333 in xrange(_size329): + _key334 = iprot.readString().decode('utf-8') + _val335 = iprot.readDouble(); + self.system_stats[_key334] = _val335 + iprot.readMapEnd() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -4710,23 +4745,23 @@ def write(self, oprot): if self.used_ports is not None: oprot.writeFieldBegin('used_ports', TType.LIST, 4) oprot.writeListBegin(TType.I64, len(self.used_ports)) - for iter320 in self.used_ports: - oprot.writeI64(iter320) + for iter336 in self.used_ports: + oprot.writeI64(iter336) oprot.writeListEnd() oprot.writeFieldEnd() if self.meta is not None: oprot.writeFieldBegin('meta', TType.LIST, 5) oprot.writeListBegin(TType.I64, len(self.meta)) - for iter321 in self.meta: - oprot.writeI64(iter321) + for iter337 in self.meta: + oprot.writeI64(iter337) oprot.writeListEnd() oprot.writeFieldEnd() if self.scheduler_meta is not None: oprot.writeFieldBegin('scheduler_meta', TType.MAP, 6) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.scheduler_meta)) - for kiter322,viter323 in self.scheduler_meta.items(): - oprot.writeString(kiter322.encode('utf-8')) - oprot.writeString(viter323.encode('utf-8')) + for kiter338,viter339 in self.scheduler_meta.items(): + oprot.writeString(kiter338.encode('utf-8')) + oprot.writeString(viter339.encode('utf-8')) oprot.writeMapEnd() oprot.writeFieldEnd() if self.uptime_secs is not None: @@ -4737,6 +4772,14 @@ def write(self, oprot): oprot.writeFieldBegin('version', TType.STRING, 8) oprot.writeString(self.version.encode('utf-8')) oprot.writeFieldEnd() + if self.system_stats is not None: + oprot.writeFieldBegin('system_stats', TType.MAP, 9) + oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(self.system_stats)) + for kiter340,viter341 in self.system_stats.items(): + oprot.writeString(kiter340.encode('utf-8')) + oprot.writeDouble(viter341) + oprot.writeMapEnd() + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -4758,6 +4801,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.scheduler_meta) value = (value * 31) ^ hash(self.uptime_secs) value = (value * 31) ^ hash(self.version) + value = (value * 31) ^ hash(self.system_stats) return value def __repr__(self): @@ -4805,10 +4849,10 @@ def read(self, iprot): elif fid == 2: if ftype == TType.SET: self.port = set() - (_etype327, _size324) = iprot.readSetBegin() - for _i328 in xrange(_size324): - _elem329 = iprot.readI64(); - self.port.add(_elem329) + (_etype345, _size342) = iprot.readSetBegin() + for _i346 in xrange(_size342): + _elem347 = iprot.readI64(); + self.port.add(_elem347) iprot.readSetEnd() else: iprot.skip(ftype) @@ -4829,8 +4873,8 @@ def write(self, oprot): if self.port is not None: oprot.writeFieldBegin('port', TType.SET, 2) oprot.writeSetBegin(TType.I64, len(self.port)) - for iter330 in self.port: - oprot.writeI64(iter330) + for iter348 in self.port: + oprot.writeI64(iter348) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -4913,44 +4957,44 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.node_host = {} - (_ktype332, _vtype333, _size331 ) = iprot.readMapBegin() - for _i335 in xrange(_size331): - _key336 = iprot.readString().decode('utf-8') - _val337 = iprot.readString().decode('utf-8') - self.node_host[_key336] = _val337 + (_ktype350, _vtype351, _size349 ) = iprot.readMapBegin() + for _i353 in xrange(_size349): + _key354 = iprot.readString().decode('utf-8') + _val355 = iprot.readString().decode('utf-8') + self.node_host[_key354] = _val355 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.executor_node_port = {} - (_ktype339, _vtype340, _size338 ) = iprot.readMapBegin() - for _i342 in xrange(_size338): - _key343 = [] - (_etype348, _size345) = iprot.readListBegin() - for _i349 in xrange(_size345): - _elem350 = iprot.readI64(); - _key343.append(_elem350) + (_ktype357, _vtype358, _size356 ) = iprot.readMapBegin() + for _i360 in xrange(_size356): + _key361 = [] + (_etype366, _size363) = iprot.readListBegin() + for _i367 in xrange(_size363): + _elem368 = iprot.readI64(); + _key361.append(_elem368) iprot.readListEnd() - _val344 = NodeInfo() - _val344.read(iprot) - self.executor_node_port[_key343] = _val344 + _val362 = NodeInfo() + _val362.read(iprot) + self.executor_node_port[_key361] = _val362 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.MAP: self.executor_start_time_secs = {} - (_ktype352, _vtype353, _size351 ) = iprot.readMapBegin() - for _i355 in xrange(_size351): - _key356 = [] - (_etype361, _size358) = iprot.readListBegin() - for _i362 in xrange(_size358): - _elem363 = iprot.readI64(); - _key356.append(_elem363) + (_ktype370, _vtype371, _size369 ) = iprot.readMapBegin() + for _i373 in xrange(_size369): + _key374 = [] + (_etype379, _size376) = iprot.readListBegin() + for _i380 in xrange(_size376): + _elem381 = iprot.readI64(); + _key374.append(_elem381) iprot.readListEnd() - _val357 = iprot.readI64(); - self.executor_start_time_secs[_key356] = _val357 + _val375 = iprot.readI64(); + self.executor_start_time_secs[_key374] = _val375 iprot.readMapEnd() else: iprot.skip(ftype) @@ -4971,31 +5015,31 @@ def write(self, oprot): if self.node_host is not None: oprot.writeFieldBegin('node_host', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.node_host)) - for kiter364,viter365 in self.node_host.items(): - oprot.writeString(kiter364.encode('utf-8')) - oprot.writeString(viter365.encode('utf-8')) + for kiter382,viter383 in self.node_host.items(): + oprot.writeString(kiter382.encode('utf-8')) + oprot.writeString(viter383.encode('utf-8')) oprot.writeMapEnd() oprot.writeFieldEnd() if self.executor_node_port is not None: oprot.writeFieldBegin('executor_node_port', TType.MAP, 3) oprot.writeMapBegin(TType.LIST, TType.STRUCT, len(self.executor_node_port)) - for kiter366,viter367 in self.executor_node_port.items(): - oprot.writeListBegin(TType.I64, len(kiter366)) - for iter368 in kiter366: - oprot.writeI64(iter368) + for kiter384,viter385 in self.executor_node_port.items(): + oprot.writeListBegin(TType.I64, len(kiter384)) + for iter386 in kiter384: + oprot.writeI64(iter386) oprot.writeListEnd() - viter367.write(oprot) + viter385.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.executor_start_time_secs is not None: oprot.writeFieldBegin('executor_start_time_secs', TType.MAP, 4) oprot.writeMapBegin(TType.LIST, TType.I64, len(self.executor_start_time_secs)) - for kiter369,viter370 in self.executor_start_time_secs.items(): - oprot.writeListBegin(TType.I64, len(kiter369)) - for iter371 in kiter369: - oprot.writeI64(iter371) + for kiter387,viter388 in self.executor_start_time_secs.items(): + oprot.writeListBegin(TType.I64, len(kiter387)) + for iter389 in kiter387: + oprot.writeI64(iter389) oprot.writeListEnd() - oprot.writeI64(viter370) + oprot.writeI64(viter388) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5168,11 +5212,11 @@ def read(self, iprot): elif fid == 4: if ftype == TType.MAP: self.component_executors = {} - (_ktype373, _vtype374, _size372 ) = iprot.readMapBegin() - for _i376 in xrange(_size372): - _key377 = iprot.readString().decode('utf-8') - _val378 = iprot.readI32(); - self.component_executors[_key377] = _val378 + (_ktype391, _vtype392, _size390 ) = iprot.readMapBegin() + for _i394 in xrange(_size390): + _key395 = iprot.readString().decode('utf-8') + _val396 = iprot.readI32(); + self.component_executors[_key395] = _val396 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5222,9 +5266,9 @@ def write(self, oprot): if self.component_executors is not None: oprot.writeFieldBegin('component_executors', TType.MAP, 4) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.component_executors)) - for kiter379,viter380 in self.component_executors.items(): - oprot.writeString(kiter379.encode('utf-8')) - oprot.writeI32(viter380) + for kiter397,viter398 in self.component_executors.items(): + oprot.writeString(kiter397.encode('utf-8')) + oprot.writeI32(viter398) oprot.writeMapEnd() oprot.writeFieldEnd() if self.launch_time_secs is not None: @@ -5286,6 +5330,7 @@ class ClusterWorkerHeartbeat: - executor_stats - time_secs - uptime_secs + - system_stats """ thrift_spec = ( @@ -5294,13 +5339,15 @@ class ClusterWorkerHeartbeat: (2, TType.MAP, 'executor_stats', (TType.STRUCT,(ExecutorInfo, ExecutorInfo.thrift_spec),TType.STRUCT,(ExecutorStats, ExecutorStats.thrift_spec)), None, ), # 2 (3, TType.I32, 'time_secs', None, None, ), # 3 (4, TType.I32, 'uptime_secs', None, None, ), # 4 + (5, TType.MAP, 'system_stats', (TType.STRING,None,TType.DOUBLE,None), None, ), # 5 ) - def __init__(self, storm_id=None, executor_stats=None, time_secs=None, uptime_secs=None,): + def __init__(self, storm_id=None, executor_stats=None, time_secs=None, uptime_secs=None, system_stats=None,): self.storm_id = storm_id self.executor_stats = executor_stats self.time_secs = time_secs self.uptime_secs = uptime_secs + self.system_stats = system_stats def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -5319,13 +5366,13 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.executor_stats = {} - (_ktype382, _vtype383, _size381 ) = iprot.readMapBegin() - for _i385 in xrange(_size381): - _key386 = ExecutorInfo() - _key386.read(iprot) - _val387 = ExecutorStats() - _val387.read(iprot) - self.executor_stats[_key386] = _val387 + (_ktype400, _vtype401, _size399 ) = iprot.readMapBegin() + for _i403 in xrange(_size399): + _key404 = ExecutorInfo() + _key404.read(iprot) + _val405 = ExecutorStats() + _val405.read(iprot) + self.executor_stats[_key404] = _val405 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5339,6 +5386,17 @@ def read(self, iprot): self.uptime_secs = iprot.readI32(); else: iprot.skip(ftype) + elif fid == 5: + if ftype == TType.MAP: + self.system_stats = {} + (_ktype407, _vtype408, _size406 ) = iprot.readMapBegin() + for _i410 in xrange(_size406): + _key411 = iprot.readString().decode('utf-8') + _val412 = iprot.readDouble(); + self.system_stats[_key411] = _val412 + iprot.readMapEnd() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -5356,9 +5414,9 @@ def write(self, oprot): if self.executor_stats is not None: oprot.writeFieldBegin('executor_stats', TType.MAP, 2) oprot.writeMapBegin(TType.STRUCT, TType.STRUCT, len(self.executor_stats)) - for kiter388,viter389 in self.executor_stats.items(): - kiter388.write(oprot) - viter389.write(oprot) + for kiter413,viter414 in self.executor_stats.items(): + kiter413.write(oprot) + viter414.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.time_secs is not None: @@ -5369,6 +5427,14 @@ def write(self, oprot): oprot.writeFieldBegin('uptime_secs', TType.I32, 4) oprot.writeI32(self.uptime_secs) oprot.writeFieldEnd() + if self.system_stats is not None: + oprot.writeFieldBegin('system_stats', TType.MAP, 5) + oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(self.system_stats)) + for kiter415,viter416 in self.system_stats.items(): + oprot.writeString(kiter415.encode('utf-8')) + oprot.writeDouble(viter416) + oprot.writeMapEnd() + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -5390,6 +5456,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.executor_stats) value = (value * 31) ^ hash(self.time_secs) value = (value * 31) ^ hash(self.uptime_secs) + value = (value * 31) ^ hash(self.system_stats) return value def __repr__(self): @@ -5511,12 +5578,12 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.serialized_parts = {} - (_ktype391, _vtype392, _size390 ) = iprot.readMapBegin() - for _i394 in xrange(_size390): - _key395 = iprot.readString().decode('utf-8') - _val396 = ThriftSerializedObject() - _val396.read(iprot) - self.serialized_parts[_key395] = _val396 + (_ktype418, _vtype419, _size417 ) = iprot.readMapBegin() + for _i421 in xrange(_size417): + _key422 = iprot.readString().decode('utf-8') + _val423 = ThriftSerializedObject() + _val423.read(iprot) + self.serialized_parts[_key422] = _val423 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5533,9 +5600,9 @@ def write(self, oprot): if self.serialized_parts is not None: oprot.writeFieldBegin('serialized_parts', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.serialized_parts)) - for kiter397,viter398 in self.serialized_parts.items(): - oprot.writeString(kiter397.encode('utf-8')) - viter398.write(oprot) + for kiter424,viter425 in self.serialized_parts.items(): + oprot.writeString(kiter424.encode('utf-8')) + viter425.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5597,11 +5664,11 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.executors = [] - (_etype402, _size399) = iprot.readListBegin() - for _i403 in xrange(_size399): - _elem404 = ExecutorInfo() - _elem404.read(iprot) - self.executors.append(_elem404) + (_etype429, _size426) = iprot.readListBegin() + for _i430 in xrange(_size426): + _elem431 = ExecutorInfo() + _elem431.read(iprot) + self.executors.append(_elem431) iprot.readListEnd() else: iprot.skip(ftype) @@ -5622,8 +5689,8 @@ def write(self, oprot): if self.executors is not None: oprot.writeFieldBegin('executors', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.executors)) - for iter405 in self.executors: - iter405.write(oprot) + for iter432 in self.executors: + iter432.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5747,11 +5814,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.approved_workers = {} - (_ktype407, _vtype408, _size406 ) = iprot.readMapBegin() - for _i410 in xrange(_size406): - _key411 = iprot.readString().decode('utf-8') - _val412 = iprot.readI32(); - self.approved_workers[_key411] = _val412 + (_ktype434, _vtype435, _size433 ) = iprot.readMapBegin() + for _i437 in xrange(_size433): + _key438 = iprot.readString().decode('utf-8') + _val439 = iprot.readI32(); + self.approved_workers[_key438] = _val439 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5768,9 +5835,9 @@ def write(self, oprot): if self.approved_workers is not None: oprot.writeFieldBegin('approved_workers', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.approved_workers)) - for kiter413,viter414 in self.approved_workers.items(): - oprot.writeString(kiter413.encode('utf-8')) - oprot.writeI32(viter414) + for kiter440,viter441 in self.approved_workers.items(): + oprot.writeString(kiter440.encode('utf-8')) + oprot.writeI32(viter441) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5824,12 +5891,12 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.assignments = {} - (_ktype416, _vtype417, _size415 ) = iprot.readMapBegin() - for _i419 in xrange(_size415): - _key420 = iprot.readI32(); - _val421 = LocalAssignment() - _val421.read(iprot) - self.assignments[_key420] = _val421 + (_ktype443, _vtype444, _size442 ) = iprot.readMapBegin() + for _i446 in xrange(_size442): + _key447 = iprot.readI32(); + _val448 = LocalAssignment() + _val448.read(iprot) + self.assignments[_key447] = _val448 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5846,9 +5913,9 @@ def write(self, oprot): if self.assignments is not None: oprot.writeFieldBegin('assignments', TType.MAP, 1) oprot.writeMapBegin(TType.I32, TType.STRUCT, len(self.assignments)) - for kiter422,viter423 in self.assignments.items(): - oprot.writeI32(kiter422) - viter423.write(oprot) + for kiter449,viter450 in self.assignments.items(): + oprot.writeI32(kiter449) + viter450.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5921,11 +5988,11 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.executors = [] - (_etype427, _size424) = iprot.readListBegin() - for _i428 in xrange(_size424): - _elem429 = ExecutorInfo() - _elem429.read(iprot) - self.executors.append(_elem429) + (_etype454, _size451) = iprot.readListBegin() + for _i455 in xrange(_size451): + _elem456 = ExecutorInfo() + _elem456.read(iprot) + self.executors.append(_elem456) iprot.readListEnd() else: iprot.skip(ftype) @@ -5955,8 +6022,8 @@ def write(self, oprot): if self.executors is not None: oprot.writeFieldBegin('executors', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.executors)) - for iter430 in self.executors: - iter430.write(oprot) + for iter457 in self.executors: + iter457.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.port is not None: diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift index a4b0b2aa47b..072dfb257cf 100644 --- a/storm-core/src/storm.thrift +++ b/storm-core/src/storm.thrift @@ -154,6 +154,7 @@ struct SupervisorSummary { 4: required i32 num_used_workers; 5: required string supervisor_id; 6: optional string version = "VERSION_NOT_PROVIDED"; + 7: optional map system_stats; } struct ClusterSummary { @@ -254,6 +255,7 @@ struct SupervisorInfo { 6: optional map scheduler_meta; 7: optional i64 uptime_secs; 8: optional string version; + 9: optional map system_stats; } struct NodeInfo { @@ -296,6 +298,7 @@ struct ClusterWorkerHeartbeat { 2: required map executor_stats; 3: required i32 time_secs; 4: required i32 uptime_secs; + 5: optional map system_stats; } struct ThriftSerializedObject {