You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/05/15 20:02:51 UTC
[09/13] storm git commit: Included the default version info
"VERSION_NOT_FOUND" tag in the thrift file. Made the version "optional" in
the thrift file Accordingly modified the nimbus.clj file as per the above
specifications.
Included the default version info "VERSION_NOT_FOUND" tag in the thrift file. Made the version "optional" in the thrift file
Accordingly modified the nimbus.clj file as per the above specifications.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/765354cc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/765354cc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/765354cc
Branch: refs/heads/0.10.x-branch
Commit: 765354ccc2976533fee57d2ce4330957f8302e64
Parents: a13c465
Author: sanket <sc...@yahoo-inc.com>
Authored: Mon Apr 20 12:41:44 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:42:11 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/converter.clj | 3 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 9 +--
.../storm/generated/SupervisorInfo.java | 2 +-
.../storm/generated/SupervisorSummary.java | 60 ++++++++++++--------
storm-core/src/storm.thrift | 2 +-
5 files changed, 44 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/storm-core/src/clj/backtype/storm/converter.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/converter.clj b/storm-core/src/clj/backtype/storm/converter.clj
index 3b79751..45e3033 100644
--- a/storm-core/src/clj/backtype/storm/converter.clj
+++ b/storm-core/src/clj/backtype/storm/converter.clj
@@ -26,8 +26,7 @@
(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);;log
- )))
+ (.get_version supervisor-info))))
(defn thriftify-assignment [assignment]
(doto (Assignment.)
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 5d0a0f2..dc03e07 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1246,13 +1246,14 @@
;; in standalone just look at metadata, otherwise just say N/A?
supervisor-summaries (dofor [[id info] supervisor-infos]
(let [ports (set (:meta info)) ;;TODO: this is only true for standalone
- ]
- (SupervisorSummary. (:hostname info)
+
+ sup-sum (SupervisorSummary. (:hostname info)
(:uptime-secs info)
(count ports)
(count (:used-ports info))
- id
- (:version info))
+ id) ]
+ (when-let [version (:version info)] (.set_version sup-sum version))
+ sup-sum
))
nimbus-uptime ((:uptime nimbus))
bases (topology-bases storm-cluster-state)
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/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 6272e56..9083b0d 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.Logger;
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-4-20")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/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 b267cf1..9bdf9f7 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.Logger;
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-4-20")
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");
@@ -73,7 +73,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
private int num_workers; // required
private int num_used_workers; // required
private String supervisor_id; // required
- private String version; // required
+ private String version; // 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 {
@@ -153,6 +153,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
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};
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);
@@ -166,13 +167,15 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED,
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.REQUIRED,
+ 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)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap);
}
public SupervisorSummary() {
+ this.version = "VERSION_NOT_PROVIDED";
+
}
public SupervisorSummary(
@@ -180,8 +183,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
int uptime_secs,
int num_workers,
int num_used_workers,
- String supervisor_id,
- String version)
+ String supervisor_id)
{
this();
this.host = host;
@@ -192,7 +194,6 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
this.num_used_workers = num_used_workers;
set_num_used_workers_isSet(true);
this.supervisor_id = supervisor_id;
- this.version = version;
}
/**
@@ -228,7 +229,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
set_num_used_workers_isSet(false);
this.num_used_workers = 0;
this.supervisor_id = null;
- this.version = null;
+ this.version = "VERSION_NOT_PROVIDED";
+
}
public String get_host() {
@@ -688,14 +690,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
sb.append(this.supervisor_id);
}
first = false;
- if (!first) sb.append(", ");
- sb.append("version:");
- if (this.version == null) {
- sb.append("null");
- } else {
- sb.append(this.version);
+ if (is_set_version()) {
+ if (!first) sb.append(", ");
+ sb.append("version:");
+ if (this.version == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.version);
+ }
+ first = false;
}
- first = false;
sb.append(")");
return sb.toString();
}
@@ -722,10 +726,6 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
}
- if (!is_set_version()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
- }
-
// check for sub-struct validity
}
@@ -846,9 +846,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
oprot.writeFieldEnd();
}
if (struct.version != null) {
- oprot.writeFieldBegin(VERSION_FIELD_DESC);
- oprot.writeString(struct.version);
- oprot.writeFieldEnd();
+ if (struct.is_set_version()) {
+ oprot.writeFieldBegin(VERSION_FIELD_DESC);
+ oprot.writeString(struct.version);
+ oprot.writeFieldEnd();
+ }
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -872,7 +874,14 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
oprot.writeI32(struct.num_workers);
oprot.writeI32(struct.num_used_workers);
oprot.writeString(struct.supervisor_id);
- oprot.writeString(struct.version);
+ BitSet optionals = new BitSet();
+ if (struct.is_set_version()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_version()) {
+ oprot.writeString(struct.version);
+ }
}
@Override
@@ -888,8 +897,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
struct.set_num_used_workers_isSet(true);
struct.supervisor_id = iprot.readString();
struct.set_supervisor_id_isSet(true);
- struct.version = iprot.readString();
- struct.set_version_isSet(true);
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.version = iprot.readString();
+ struct.set_version_isSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/storm-core/src/storm.thrift
----------------------------------------------------------------------
diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift
index 3248e3f..2640433 100644
--- a/storm-core/src/storm.thrift
+++ b/storm-core/src/storm.thrift
@@ -153,7 +153,7 @@ struct SupervisorSummary {
3: required i32 num_workers;
4: required i32 num_used_workers;
5: required string supervisor_id;
- 6: required string version;
+ 6: optional string version = "VERSION_NOT_PROVIDED";
}
struct ClusterSummary {