You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/11/12 15:31:11 UTC
[2/6] storm git commit: Upgrading to thrift 0.9.3
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java b/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java
index a8d6ec7..053db0a 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggregateStats, SpoutAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutAggregateStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutAggregateStats");
@@ -195,7 +195,7 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
public Object getFieldValue(_Fields field) {
switch (field) {
case COMPLETE_LATENCY_MS:
- return Double.valueOf(get_complete_latency_ms());
+ return get_complete_latency_ms();
}
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
index 3fc45cf..492cc36 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutSpec> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutSpec");
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
index 478143f..3f17136 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
index 530b7ca..24b3e5c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<StateSpoutSpec> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StateSpoutSpec");
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/StormBase.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StormBase.java b/storm-core/src/jvm/backtype/storm/generated/StormBase.java
index f4af67a..2d8bf15 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StormBase.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormBase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._Fields>, java.io.Serializable, Cloneable, Comparable<StormBase> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormBase");
@@ -611,13 +611,13 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
return get_status();
case NUM_WORKERS:
- return Integer.valueOf(get_num_workers());
+ return get_num_workers();
case COMPONENT_EXECUTORS:
return get_component_executors();
case LAUNCH_TIME_SECS:
- return Integer.valueOf(get_launch_time_secs());
+ return get_launch_time_secs();
case OWNER:
return get_owner();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
index 9b96fa3..81fe93e 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable, Comparable<StormTopology> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormTopology");
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
index e3b0fdb..caa1887 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable, Comparable<StreamInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StreamInfo");
@@ -266,7 +266,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
return get_output_fields();
case DIRECT:
- return Boolean.valueOf(is_direct());
+ return is_direct();
}
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
index 358468a..214ded0 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable, Comparable<SubmitOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SubmitOptions");
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
index 6d68927..dcfb353 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, SupervisorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorInfo");
@@ -602,7 +602,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
public Object getFieldValue(_Fields field) {
switch (field) {
case TIME_SECS:
- return Long.valueOf(get_time_secs());
+ return get_time_secs();
case HOSTNAME:
return get_hostname();
@@ -620,7 +620,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
return get_scheduler_meta();
case UPTIME_SECS:
- return Long.valueOf(get_uptime_secs());
+ return get_uptime_secs();
case VERSION:
return get_version();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
index 7e36d0f..2c3f330 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorSummary");
@@ -483,13 +483,13 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
return get_host();
case UPTIME_SECS:
- return Integer.valueOf(get_uptime_secs());
+ return get_uptime_secs();
case NUM_WORKERS:
- return Integer.valueOf(get_num_workers());
+ return get_num_workers();
case NUM_USED_WORKERS:
- return Integer.valueOf(get_num_used_workers());
+ return get_num_used_workers();
case SUPERVISOR_ID:
return get_supervisor_id();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java b/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java
index 4b2bc63..810bea8 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSerializedObject, ThriftSerializedObject._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftSerializedObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftSerializedObject");
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/TopologyActionOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyActionOptions.java b/storm-core/src/jvm/backtype/storm/generated/TopologyActionOptions.java
index c6fea05..6e6d704 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyActionOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyActionOptions.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/TopologyHistoryInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyHistoryInfo.java b/storm-core/src/jvm/backtype/storm/generated/TopologyHistoryInfo.java
index 8afaca3..cf9bff1 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyHistoryInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyHistoryInfo.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHistoryInfo, TopologyHistoryInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyHistoryInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyHistoryInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
index 9a4111f..f7c44b4 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-29")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyInfo");
@@ -916,7 +916,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
return get_name();
case UPTIME_SECS:
- return Integer.valueOf(get_uptime_secs());
+ return get_uptime_secs();
case EXECUTORS:
return get_executors();
@@ -937,25 +937,25 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
return get_owner();
case REPLICATION_COUNT:
- return Integer.valueOf(get_replication_count());
+ return get_replication_count();
case REQUESTED_MEMONHEAP:
- return Double.valueOf(get_requested_memonheap());
+ return get_requested_memonheap();
case REQUESTED_MEMOFFHEAP:
- return Double.valueOf(get_requested_memoffheap());
+ return get_requested_memoffheap();
case REQUESTED_CPU:
- return Double.valueOf(get_requested_cpu());
+ return get_requested_cpu();
case ASSIGNED_MEMONHEAP:
- return Double.valueOf(get_assigned_memonheap());
+ return get_assigned_memonheap();
case ASSIGNED_MEMOFFHEAP:
- return Double.valueOf(get_assigned_memoffheap());
+ return get_assigned_memoffheap();
case ASSIGNED_CPU:
- return Double.valueOf(get_assigned_cpu());
+ return get_assigned_cpu();
}
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java b/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java
index a8d6c9e..7117bd4 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java b/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
index 257ec9d..4813fde 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-29")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInfo, TopologyPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyPageInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyPageInfo");
@@ -1088,19 +1088,19 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
return get_name();
case UPTIME_SECS:
- return Integer.valueOf(get_uptime_secs());
+ return get_uptime_secs();
case STATUS:
return get_status();
case NUM_TASKS:
- return Integer.valueOf(get_num_tasks());
+ return get_num_tasks();
case NUM_WORKERS:
- return Integer.valueOf(get_num_workers());
+ return get_num_workers();
case NUM_EXECUTORS:
- return Integer.valueOf(get_num_executors());
+ return get_num_executors();
case TOPOLOGY_CONF:
return get_topology_conf();
@@ -1124,25 +1124,25 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
return get_debug_options();
case REPLICATION_COUNT:
- return Integer.valueOf(get_replication_count());
+ return get_replication_count();
case REQUESTED_MEMONHEAP:
- return Double.valueOf(get_requested_memonheap());
+ return get_requested_memonheap();
case REQUESTED_MEMOFFHEAP:
- return Double.valueOf(get_requested_memoffheap());
+ return get_requested_memoffheap();
case REQUESTED_CPU:
- return Double.valueOf(get_requested_cpu());
+ return get_requested_cpu();
case ASSIGNED_MEMONHEAP:
- return Double.valueOf(get_assigned_memonheap());
+ return get_assigned_memonheap();
case ASSIGNED_MEMOFFHEAP:
- return Double.valueOf(get_assigned_memoffheap());
+ return get_assigned_memoffheap();
case ASSIGNED_CPU:
- return Double.valueOf(get_assigned_cpu());
+ return get_assigned_cpu();
}
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java b/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java
index 0ff01de..99f3922 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, TopologyStats._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/TopologyStatus.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyStatus.java b/storm-core/src/jvm/backtype/storm/generated/TopologyStatus.java
index 8183ab2..3866a8c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyStatus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyStatus.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
index 7bb2e44..5387e62 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-29")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class TopologySummary implements org.apache.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable, Comparable<TopologySummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologySummary");
@@ -844,16 +844,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
return get_name();
case NUM_TASKS:
- return Integer.valueOf(get_num_tasks());
+ return get_num_tasks();
case NUM_EXECUTORS:
- return Integer.valueOf(get_num_executors());
+ return get_num_executors();
case NUM_WORKERS:
- return Integer.valueOf(get_num_workers());
+ return get_num_workers();
case UPTIME_SECS:
- return Integer.valueOf(get_uptime_secs());
+ return get_uptime_secs();
case STATUS:
return get_status();
@@ -865,25 +865,25 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
return get_owner();
case REPLICATION_COUNT:
- return Integer.valueOf(get_replication_count());
+ return get_replication_count();
case REQUESTED_MEMONHEAP:
- return Double.valueOf(get_requested_memonheap());
+ return get_requested_memonheap();
case REQUESTED_MEMOFFHEAP:
- return Double.valueOf(get_requested_memoffheap());
+ return get_requested_memoffheap();
case REQUESTED_CPU:
- return Double.valueOf(get_requested_cpu());
+ return get_requested_cpu();
case ASSIGNED_MEMONHEAP:
- return Double.valueOf(get_assigned_memonheap());
+ return get_assigned_memonheap();
case ASSIGNED_MEMOFFHEAP:
- return Double.valueOf(get_assigned_memoffheap());
+ return get_assigned_memoffheap();
case ASSIGNED_CPU:
- return Double.valueOf(get_assigned_cpu());
+ return get_assigned_cpu();
}
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/generated/WorkerResources.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/WorkerResources.java b/storm-core/src/jvm/backtype/storm/generated/WorkerResources.java
index 7cfadd7..3af22fb 100644
--- a/storm-core/src/jvm/backtype/storm/generated/WorkerResources.java
+++ b/storm-core/src/jvm/backtype/storm/generated/WorkerResources.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class WorkerResources implements org.apache.thrift.TBase<WorkerResources, WorkerResources._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerResources> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerResources");
@@ -277,13 +277,13 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
public Object getFieldValue(_Fields field) {
switch (field) {
case MEM_ON_HEAP:
- return Double.valueOf(get_mem_on_heap());
+ return get_mem_on_heap();
case MEM_OFF_HEAP:
- return Double.valueOf(get_mem_off_heap());
+ return get_mem_off_heap();
case CPU:
- return Double.valueOf(get_cpu());
+ return get_cpu();
}
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java b/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java
index 7a0a6f2..b73c585 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java
@@ -73,7 +73,7 @@ public class SimpleTransportPlugin implements ITransportPlugin {
THsHaServer.Args server_args = new THsHaServer.Args(serverTransport).
processor(new SimpleWrapProcessor(processor)).
- workerThreads(numWorkerThreads).
+ maxWorkerThreads(numWorkerThreads).
protocolFactory(new TBinaryProtocol.Factory(false, true, maxBufferSize, -1));
if (queueSize != null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/py/storm/DistributedRPC-remote
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/DistributedRPC-remote b/storm-core/src/py/storm/DistributedRPC-remote
index 3d06d07..90f894a 100644
--- a/storm-core/src/py/storm/DistributedRPC-remote
+++ b/storm-core/src/py/storm/DistributedRPC-remote
@@ -18,7 +18,7 @@
#!/usr/bin/env python
#
-# Autogenerated by Thrift Compiler (0.9.2)
+# Autogenerated by Thrift Compiler (0.9.3)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/py/storm/DistributedRPC.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/DistributedRPC.py b/storm-core/src/py/storm/DistributedRPC.py
index 330499c..225c57e 100644
--- a/storm-core/src/py/storm/DistributedRPC.py
+++ b/storm-core/src/py/storm/DistributedRPC.py
@@ -17,7 +17,7 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.9.2)
+# Autogenerated by Thrift Compiler (0.9.3)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
@@ -25,6 +25,7 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+import logging
from ttypes import *
from thrift.Thrift import TProcessor
from thrift.transport import TTransport
@@ -87,7 +88,7 @@ class Client(Iface):
raise result.e
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "execute failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "execute failed: unknown result")
class Processor(Iface, TProcessor):
@@ -118,11 +119,20 @@ class Processor(Iface, TProcessor):
result = execute_result()
try:
result.success = self._handler.execute(args.functionName, args.funcArgs)
- except DRPCExecutionException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except DRPCExecutionException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("execute", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("execute", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/py/storm/DistributedRPCInvocations-remote
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/DistributedRPCInvocations-remote b/storm-core/src/py/storm/DistributedRPCInvocations-remote
index 9dd50cd..01435b6 100644
--- a/storm-core/src/py/storm/DistributedRPCInvocations-remote
+++ b/storm-core/src/py/storm/DistributedRPCInvocations-remote
@@ -18,7 +18,7 @@
#!/usr/bin/env python
#
-# Autogenerated by Thrift Compiler (0.9.2)
+# Autogenerated by Thrift Compiler (0.9.3)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/py/storm/DistributedRPCInvocations.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/DistributedRPCInvocations.py b/storm-core/src/py/storm/DistributedRPCInvocations.py
index 493fcc7..207fa9d 100644
--- a/storm-core/src/py/storm/DistributedRPCInvocations.py
+++ b/storm-core/src/py/storm/DistributedRPCInvocations.py
@@ -17,7 +17,7 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.9.2)
+# Autogenerated by Thrift Compiler (0.9.3)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
@@ -25,6 +25,7 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+import logging
from ttypes import *
from thrift.Thrift import TProcessor
from thrift.transport import TTransport
@@ -130,7 +131,7 @@ class Client(Iface):
return result.success
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchRequest failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchRequest failed: unknown result")
def failRequest(self, id):
"""
@@ -194,9 +195,17 @@ class Processor(Iface, TProcessor):
result = result_result()
try:
self._handler.result(args.id, args.result)
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("result", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("result", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -208,9 +217,17 @@ class Processor(Iface, TProcessor):
result = fetchRequest_result()
try:
result.success = self._handler.fetchRequest(args.functionName)
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("fetchRequest", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("fetchRequest", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -222,9 +239,17 @@ class Processor(Iface, TProcessor):
result = failRequest_result()
try:
self._handler.failRequest(args.id)
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("failRequest", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("failRequest", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/py/storm/Nimbus-remote
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/Nimbus-remote b/storm-core/src/py/storm/Nimbus-remote
index 8f0dbc9..63e7dce 100644
--- a/storm-core/src/py/storm/Nimbus-remote
+++ b/storm-core/src/py/storm/Nimbus-remote
@@ -18,7 +18,7 @@
#!/usr/bin/env python
#
-# Autogenerated by Thrift Compiler (0.9.2)
+# Autogenerated by Thrift Compiler (0.9.3)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/py/storm/Nimbus.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/Nimbus.py b/storm-core/src/py/storm/Nimbus.py
index a2d4c0b..14e5f2e 100644
--- a/storm-core/src/py/storm/Nimbus.py
+++ b/storm-core/src/py/storm/Nimbus.py
@@ -17,7 +17,7 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.9.2)
+# Autogenerated by Thrift Compiler (0.9.3)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
@@ -25,6 +25,7 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+import logging
from ttypes import *
from thrift.Thrift import TProcessor
from thrift.transport import TTransport
@@ -577,7 +578,7 @@ class Client(Iface):
iprot.readMessageEnd()
if result.success is not None:
return result.success
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getLogConfig failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getLogConfig failed: unknown result")
def debug(self, name, component, enable, samplingPercentage):
"""
@@ -688,7 +689,7 @@ class Client(Iface):
iprot.readMessageEnd()
if result.success is not None:
return result.success
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getComponentPendingProfileActions failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getComponentPendingProfileActions failed: unknown result")
def uploadNewCredentials(self, name, creds):
"""
@@ -753,7 +754,7 @@ class Client(Iface):
return result.success
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "beginFileUpload failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "beginFileUpload failed: unknown result")
def uploadChunk(self, location, chunk):
"""
@@ -850,7 +851,7 @@ class Client(Iface):
return result.success
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "beginFileDownload failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "beginFileDownload failed: unknown result")
def downloadChunk(self, id):
"""
@@ -883,7 +884,7 @@ class Client(Iface):
return result.success
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "downloadChunk failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "downloadChunk failed: unknown result")
def getNimbusConf(self):
self.send_getNimbusConf()
@@ -911,7 +912,7 @@ class Client(Iface):
return result.success
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getNimbusConf failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getNimbusConf failed: unknown result")
def getClusterInfo(self):
self.send_getClusterInfo()
@@ -939,7 +940,7 @@ class Client(Iface):
return result.success
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getClusterInfo failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getClusterInfo failed: unknown result")
def getTopologyInfo(self, id):
"""
@@ -974,7 +975,7 @@ class Client(Iface):
raise result.e
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyInfo failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyInfo failed: unknown result")
def getTopologyInfoWithOpts(self, id, options):
"""
@@ -1011,7 +1012,7 @@ class Client(Iface):
raise result.e
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyInfoWithOpts failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyInfoWithOpts failed: unknown result")
def getTopologyPageInfo(self, id, window, is_include_sys):
"""
@@ -1050,7 +1051,7 @@ class Client(Iface):
raise result.e
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyPageInfo failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyPageInfo failed: unknown result")
def getComponentPageInfo(self, topology_id, component_id, window, is_include_sys):
"""
@@ -1091,7 +1092,7 @@ class Client(Iface):
raise result.e
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getComponentPageInfo failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getComponentPageInfo failed: unknown result")
def getTopologyConf(self, id):
"""
@@ -1126,7 +1127,7 @@ class Client(Iface):
raise result.e
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyConf failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyConf failed: unknown result")
def getTopology(self, id):
"""
@@ -1163,7 +1164,7 @@ class Client(Iface):
raise result.e
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopology failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopology failed: unknown result")
def getUserTopology(self, id):
"""
@@ -1200,7 +1201,7 @@ class Client(Iface):
raise result.e
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserTopology failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserTopology failed: unknown result")
def getTopologyHistory(self, user):
"""
@@ -1233,7 +1234,7 @@ class Client(Iface):
return result.success
if result.aze is not None:
raise result.aze
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyHistory failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyHistory failed: unknown result")
class Processor(Iface, TProcessor):
@@ -1291,13 +1292,23 @@ class Processor(Iface, TProcessor):
result = submitTopology_result()
try:
self._handler.submitTopology(args.name, args.uploadedJarLocation, args.jsonConf, args.topology)
- except AlreadyAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AlreadyAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except InvalidTopologyException, ite:
+ except InvalidTopologyException as ite:
+ msg_type = TMessageType.REPLY
result.ite = ite
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("submitTopology", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("submitTopology", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1309,13 +1320,23 @@ class Processor(Iface, TProcessor):
result = submitTopologyWithOpts_result()
try:
self._handler.submitTopologyWithOpts(args.name, args.uploadedJarLocation, args.jsonConf, args.topology, args.options)
- except AlreadyAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AlreadyAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except InvalidTopologyException, ite:
+ except InvalidTopologyException as ite:
+ msg_type = TMessageType.REPLY
result.ite = ite
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("submitTopologyWithOpts", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("submitTopologyWithOpts", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1327,11 +1348,20 @@ class Processor(Iface, TProcessor):
result = killTopology_result()
try:
self._handler.killTopology(args.name)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("killTopology", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("killTopology", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1343,11 +1373,20 @@ class Processor(Iface, TProcessor):
result = killTopologyWithOpts_result()
try:
self._handler.killTopologyWithOpts(args.name, args.options)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("killTopologyWithOpts", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("killTopologyWithOpts", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1359,11 +1398,20 @@ class Processor(Iface, TProcessor):
result = activate_result()
try:
self._handler.activate(args.name)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("activate", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("activate", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1375,11 +1423,20 @@ class Processor(Iface, TProcessor):
result = deactivate_result()
try:
self._handler.deactivate(args.name)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("deactivate", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("deactivate", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1391,13 +1448,23 @@ class Processor(Iface, TProcessor):
result = rebalance_result()
try:
self._handler.rebalance(args.name, args.options)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except InvalidTopologyException, ite:
+ except InvalidTopologyException as ite:
+ msg_type = TMessageType.REPLY
result.ite = ite
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("rebalance", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("rebalance", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1407,8 +1474,16 @@ class Processor(Iface, TProcessor):
args.read(iprot)
iprot.readMessageEnd()
result = setLogConfig_result()
- self._handler.setLogConfig(args.name, args.config)
- oprot.writeMessageBegin("setLogConfig", TMessageType.REPLY, seqid)
+ try:
+ self._handler.setLogConfig(args.name, args.config)
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("setLogConfig", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1418,8 +1493,16 @@ class Processor(Iface, TProcessor):
args.read(iprot)
iprot.readMessageEnd()
result = getLogConfig_result()
- result.success = self._handler.getLogConfig(args.name)
- oprot.writeMessageBegin("getLogConfig", TMessageType.REPLY, seqid)
+ try:
+ result.success = self._handler.getLogConfig(args.name)
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getLogConfig", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1431,11 +1514,20 @@ class Processor(Iface, TProcessor):
result = debug_result()
try:
self._handler.debug(args.name, args.component, args.enable, args.samplingPercentage)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("debug", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("debug", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1445,8 +1537,16 @@ class Processor(Iface, TProcessor):
args.read(iprot)
iprot.readMessageEnd()
result = setWorkerProfiler_result()
- self._handler.setWorkerProfiler(args.id, args.profileRequest)
- oprot.writeMessageBegin("setWorkerProfiler", TMessageType.REPLY, seqid)
+ try:
+ self._handler.setWorkerProfiler(args.id, args.profileRequest)
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("setWorkerProfiler", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1456,8 +1556,16 @@ class Processor(Iface, TProcessor):
args.read(iprot)
iprot.readMessageEnd()
result = getComponentPendingProfileActions_result()
- result.success = self._handler.getComponentPendingProfileActions(args.id, args.component_id, args.action)
- oprot.writeMessageBegin("getComponentPendingProfileActions", TMessageType.REPLY, seqid)
+ try:
+ result.success = self._handler.getComponentPendingProfileActions(args.id, args.component_id, args.action)
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getComponentPendingProfileActions", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1469,13 +1577,23 @@ class Processor(Iface, TProcessor):
result = uploadNewCredentials_result()
try:
self._handler.uploadNewCredentials(args.name, args.creds)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except InvalidTopologyException, ite:
+ except InvalidTopologyException as ite:
+ msg_type = TMessageType.REPLY
result.ite = ite
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("uploadNewCredentials", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("uploadNewCredentials", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1487,9 +1605,17 @@ class Processor(Iface, TProcessor):
result = beginFileUpload_result()
try:
result.success = self._handler.beginFileUpload()
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("beginFileUpload", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("beginFileUpload", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1501,9 +1627,17 @@ class Processor(Iface, TProcessor):
result = uploadChunk_result()
try:
self._handler.uploadChunk(args.location, args.chunk)
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("uploadChunk", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("uploadChunk", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1515,9 +1649,17 @@ class Processor(Iface, TProcessor):
result = finishFileUpload_result()
try:
self._handler.finishFileUpload(args.location)
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("finishFileUpload", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("finishFileUpload", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1529,9 +1671,17 @@ class Processor(Iface, TProcessor):
result = beginFileDownload_result()
try:
result.success = self._handler.beginFileDownload(args.file)
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("beginFileDownload", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("beginFileDownload", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1543,9 +1693,17 @@ class Processor(Iface, TProcessor):
result = downloadChunk_result()
try:
result.success = self._handler.downloadChunk(args.id)
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("downloadChunk", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("downloadChunk", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1557,9 +1715,17 @@ class Processor(Iface, TProcessor):
result = getNimbusConf_result()
try:
result.success = self._handler.getNimbusConf()
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getNimbusConf", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getNimbusConf", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1571,9 +1737,17 @@ class Processor(Iface, TProcessor):
result = getClusterInfo_result()
try:
result.success = self._handler.getClusterInfo()
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getClusterInfo", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getClusterInfo", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1585,11 +1759,20 @@ class Processor(Iface, TProcessor):
result = getTopologyInfo_result()
try:
result.success = self._handler.getTopologyInfo(args.id)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getTopologyInfo", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getTopologyInfo", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1601,11 +1784,20 @@ class Processor(Iface, TProcessor):
result = getTopologyInfoWithOpts_result()
try:
result.success = self._handler.getTopologyInfoWithOpts(args.id, args.options)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getTopologyInfoWithOpts", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getTopologyInfoWithOpts", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1617,11 +1809,20 @@ class Processor(Iface, TProcessor):
result = getTopologyPageInfo_result()
try:
result.success = self._handler.getTopologyPageInfo(args.id, args.window, args.is_include_sys)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getTopologyPageInfo", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getTopologyPageInfo", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1633,11 +1834,20 @@ class Processor(Iface, TProcessor):
result = getComponentPageInfo_result()
try:
result.success = self._handler.getComponentPageInfo(args.topology_id, args.component_id, args.window, args.is_include_sys)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getComponentPageInfo", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getComponentPageInfo", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1649,11 +1859,20 @@ class Processor(Iface, TProcessor):
result = getTopologyConf_result()
try:
result.success = self._handler.getTopologyConf(args.id)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getTopologyConf", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getTopologyConf", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1665,11 +1884,20 @@ class Processor(Iface, TProcessor):
result = getTopology_result()
try:
result.success = self._handler.getTopology(args.id)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getTopology", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getTopology", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1681,11 +1909,20 @@ class Processor(Iface, TProcessor):
result = getUserTopology_result()
try:
result.success = self._handler.getUserTopology(args.id)
- except NotAliveException, e:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except NotAliveException as e:
+ msg_type = TMessageType.REPLY
result.e = e
- except AuthorizationException, aze:
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getUserTopology", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getUserTopology", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -1697,9 +1934,17 @@ class Processor(Iface, TProcessor):
result = getTopologyHistory_result()
try:
result.success = self._handler.getTopologyHistory(args.user)
- except AuthorizationException, aze:
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except AuthorizationException as aze:
+ msg_type = TMessageType.REPLY
result.aze = aze
- oprot.writeMessageBegin("getTopologyHistory", TMessageType.REPLY, seqid)
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getTopologyHistory", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -3185,12 +3430,12 @@ class debug_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.BOOL:
- self.enable = iprot.readBool();
+ self.enable = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.DOUBLE:
- self.samplingPercentage = iprot.readDouble();
+ self.samplingPercentage = iprot.readDouble()
else:
iprot.skip(ftype)
else:
@@ -3491,7 +3736,7 @@ class getComponentPendingProfileActions_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.I32:
- self.action = iprot.readI32();
+ self.action = iprot.readI32()
else:
iprot.skip(ftype)
else:
@@ -3944,7 +4189,7 @@ class uploadChunk_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.chunk = iprot.readString();
+ self.chunk = iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -4421,7 +4666,7 @@ class downloadChunk_result:
break
if fid == 0:
if ftype == TType.STRING:
- self.success = iprot.readString();
+ self.success = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -5092,7 +5337,7 @@ class getTopologyPageInfo_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.BOOL:
- self.is_include_sys = iprot.readBool();
+ self.is_include_sys = iprot.readBool()
else:
iprot.skip(ftype)
else:
@@ -5284,7 +5529,7 @@ class getComponentPageInfo_args:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.BOOL:
- self.is_include_sys = iprot.readBool();
+ self.is_include_sys = iprot.readBool()
else:
iprot.skip(ftype)
else:
http://git-wip-us.apache.org/repos/asf/storm/blob/73650789/storm-core/src/py/storm/constants.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/constants.py b/storm-core/src/py/storm/constants.py
index 3f0c64a..b403f97 100644
--- a/storm-core/src/py/storm/constants.py
+++ b/storm-core/src/py/storm/constants.py
@@ -17,7 +17,7 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.9.2)
+# Autogenerated by Thrift Compiler (0.9.3)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#