[6/7] storm git commit: add STORM-559 to changelog

[ptgoetz]

add STORM-559 to changelog


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

Branch: refs/heads/0.9.3-branch
Commit: 30e0be8616c89cb1f8a51fcf462f76a075e6e964
Parents: 835a410
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 11:11:16 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 11:11:16 2015 -0400

--
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/30e0be86/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 888ccc1..ad81e43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.9.4
+ * STORM-559: ZkHosts in README should use 2181 as port.
  * STORM-682: supervisor should handle worker state corruption gracefully.
  * STORM-693: when kafka bolt fails to write tuple, it should report error 
instead of silently acking.
  * STORM-329: fix cascading Storm failure by improving reconnection strategy 
and buffering messages

[3/7] storm git commit: STORM-682: supervisor should handle worker state corruption gracefully.

[ptgoetz]

STORM-682: supervisor should handle worker state corruption gracefully.

Signed-off-by: P. Taylor Goetz ptgo...@gmail.com


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

Branch: refs/heads/0.9.3-branch
Commit: c19e482b70f18d690ad165c78551860506486095
Parents: 92836de
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Fri Feb 20 11:56:22 2015 -0800
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 11:04:13 2015 -0400

--
 storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 7 +--
 storm-core/src/jvm/backtype/storm/utils/VersionedStore.java | 9 +
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/c19e482b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
--
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj 
b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 582c3df..f5eaf42 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -93,8 +93,11 @@
 
 (defn read-worker-heartbeat [conf id]
   (let [local-state (worker-state conf id)]
-(.get local-state LS-WORKER-HEARTBEAT)
-))
+(try
+  (.get local-state LS-WORKER-HEARTBEAT)
+  (catch IOException e
+(log-warn e Failed to read local heartbeat for workerId :  id 
,Ignoring exception.)
+nil
 
 
 (defn my-worker-ids [conf]

http://git-wip-us.apache.org/repos/asf/storm/blob/c19e482b/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java
--
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java 
b/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java
index b40aa60..07ce5a8 100644
--- a/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java
@@ -94,13 +94,14 @@ public class VersionedStore {
 public void deleteVersion(long version) throws IOException {
 File versionFile = new File(versionPath(version));
 File tokenFile = new File(tokenPath(version));
-
+
+if(tokenFile.exists()) {
+FileUtils.forceDelete(tokenFile);
+}
+
 if(versionFile.exists()) {
 FileUtils.forceDelete(versionFile);
 }
-if(tokenFile.exists()) {
-FileUtils.forceDelete(tokenFile);
-}
 }
 
 public void succeedVersion(String path) throws IOException {

[2/7] storm git commit: add STORM-693 to changelog

[ptgoetz]

add STORM-693 to changelog


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

Branch: refs/heads/0.9.3-branch
Commit: 92836de540ec8ab90d7591b96ba02126e80b5c3a
Parents: e63fb2a
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 10:59:56 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 10:59:56 2015 -0400

--
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/92836de5/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dd058d..1432f04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.9.4
+ * STORM-693: when kafka bolt fails to write tuple, it should report error 
instead of silently acking.
  * STORM-329: fix cascading Storm failure by improving reconnection strategy 
and buffering messages
  * STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: 
File '../stormconf.ser' does not exist.
 

storm git commit: [maven-release-plugin] prepare release v0.9.4

[ptgoetz]

Repository: storm
Updated Branches:
  refs/heads/0.9.3-branch b1bbacb71 - edf596bac


[maven-release-plugin] prepare release v0.9.4


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

Branch: refs/heads/0.9.3-branch
Commit: edf596bac8feab0c8721f7de94474e5549858355
Parents: b1bbacb
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 12:21:38 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 12:21:38 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/edf596ba/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index cd7becb..338e548 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   parent
   artifactIdstorm/artifactId
   groupIdorg.apache.storm/groupId
-  version0.9.4-SNAPSHOT/version
+  version0.9.4/version
   relativePath../../pom.xml/relativePath
   /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/edf596ba/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index e687da8..62ce62d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/edf596ba/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 9e8d0c4..3251bfa 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/edf596ba/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 4d4a871..9ba7e5e 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/edf596ba/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6f4d613..a941931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 groupIdorg.apache.storm/groupId
 artifactIdstorm/artifactId
-version0.9.4-SNAPSHOT/version
+version0.9.4/version
 packagingpom/packaging
 nameStorm/name
 descriptionDistributed and fault-tolerant realtime 
computation/description
@@ -166,7 +166,7 @@
 scm
 
connectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/developerConnection
-tagHEAD/tag
+tagv0.9.4/tag
 urlhttps://git-wip-us.apache.org/repos/asf/storm/url
 /scm
 

http://git-wip-us.apache.org/repos/asf/storm/blob/edf596ba/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index b5b2098..73a93ce 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ 

storm git commit: [maven-release-plugin] prepare for next development iteration

[ptgoetz]

Repository: storm
Updated Branches:
  refs/heads/0.9.3-branch edf596bac - 48d10e20e


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/0.9.3-branch
Commit: 48d10e20eb3c750fc41fcf0bef3d49501cf6d5a4
Parents: edf596b
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 12:21:45 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 12:21:45 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/48d10e20/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 338e548..5aef022 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   parent
   artifactIdstorm/artifactId
   groupIdorg.apache.storm/groupId
-  version0.9.4/version
+  version0.9.5-SNAPSHOT/version
   relativePath../../pom.xml/relativePath
   /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/48d10e20/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 62ce62d..ca28c50 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.5-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/48d10e20/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 3251bfa..b449723 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.5-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/48d10e20/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 9ba7e5e..2a368be 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.5-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/48d10e20/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a941931..2b446c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 groupIdorg.apache.storm/groupId
 artifactIdstorm/artifactId
-version0.9.4/version
+version0.9.5-SNAPSHOT/version
 packagingpom/packaging
 nameStorm/name
 descriptionDistributed and fault-tolerant realtime 
computation/description
@@ -166,7 +166,7 @@
 scm
 
connectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/developerConnection
-tagv0.9.4/tag
+tagHEAD/tag
 urlhttps://git-wip-us.apache.org/repos/asf/storm/url
 /scm
 

http://git-wip-us.apache.org/repos/asf/storm/blob/48d10e20/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 73a93ce..e1e13b0 100644
--- 

[5/7] storm git commit: STORM-559: ZkHosts in README should use 2181 as port.

[ptgoetz]

STORM-559: ZkHosts in README should use 2181 as port.

Signed-off-by: P. Taylor Goetz ptgo...@gmail.com


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

Branch: refs/heads/0.9.3-branch
Commit: 835a410c879dc1eb02d9670410f65fe0be6f28c6
Parents: f0de11a
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Wed Jan 14 12:27:35 2015 -0800
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 11:09:45 2015 -0400

--
 external/storm-kafka/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/835a410c/external/storm-kafka/README.md
--
diff --git a/external/storm-kafka/README.md b/external/storm-kafka/README.md
index 02d9767..7442a0e 100644
--- a/external/storm-kafka/README.md
+++ b/external/storm-kafka/README.md
@@ -18,7 +18,7 @@ Kafka's zookeeper's entries to track brokerHost - partition 
mapping. You can in
 public ZkHosts(String brokerZkStr, String brokerZkPath) 
 public ZkHosts(String brokerZkStr)
 ```
-Where brokerZkStr is just ip:port e.g. localhost:9092. brokerZkPath is the 
root directory under which all the topics and
+Where brokerZkStr is just ip:port e.g. localhost:2181. brokerZkPath is the 
root directory under which all the topics and
 partition information is stored. by Default this is /brokers which is what 
default kafka implementation uses.
 
 By default the broker-partition mapping is refreshed every 60 seconds from 
zookeeper. If you want to change it you

[7/7] storm git commit: add missing import in supervisor.clj

[ptgoetz]

add missing import in supervisor.clj


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

Branch: refs/heads/0.9.3-branch
Commit: b1bbacb7134d17ff47c2e8b8857a66244a4d1d4f
Parents: 30e0be8
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 11:28:11 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 11:28:11 2015 -0400

--
 storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/b1bbacb7/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
--
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj 
b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index f5eaf42..df7330a 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -15,7 +15,7 @@
 ;; limitations under the License.
 (ns backtype.storm.daemon.supervisor
   (:import [backtype.storm.scheduler ISupervisor]
-   [java.net JarURLConnection]
+   [java.io IOException]
[java.net URI])
   (:use [backtype.storm bootstrap])
   (:use [backtype.storm.daemon common])

[4/7] storm git commit: add STORM-682 to changelog

[ptgoetz]

add STORM-682 to changelog


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

Branch: refs/heads/0.9.3-branch
Commit: f0de11a20fe2f20dc1dc2f485549e0dc342f8680
Parents: c19e482
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 11:05:30 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 11:05:30 2015 -0400

--
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/f0de11a2/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1432f04..888ccc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.9.4
+ * STORM-682: supervisor should handle worker state corruption gracefully.
  * STORM-693: when kafka bolt fails to write tuple, it should report error 
instead of silently acking.
  * STORM-329: fix cascading Storm failure by improving reconnection strategy 
and buffering messages
  * STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: 
File '../stormconf.ser' does not exist.

[1/7] storm git commit: STORM-693: when bolt fails to write tuple, it should report error instead of silently acking.

[ptgoetz]

Repository: storm
Updated Branches:
  refs/heads/0.9.3-branch 6b06d8468 - b1bbacb71


STORM-693: when bolt fails to write tuple, it should report error instead of 
silently acking.

Signed-off-by: P. Taylor Goetz ptgo...@gmail.com


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

Branch: refs/heads/0.9.3-branch
Commit: e63fb2af9086e2b2e688662ca42a4b4d0112274b
Parents: 6b06d84
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Mon Mar 2 16:06:58 2015 -0800
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 10:58:55 2015 -0400

--
 external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java  | 7 +++
 .../storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/e63fb2af/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java
--
diff --git a/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java 
b/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java
index b6c3de4..cf169dc 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java
@@ -101,11 +101,10 @@ public class KafkaBoltK, V extends BaseRichBolt {
 } else {
 LOG.warn(skipping key =  + key + , topic selector returned 
null.);
 }
-} catch (Exception ex) {
-LOG.error(Could not send message with key =  + key
-+  and value =  + message +  to topic =  + topic, ex);
-} finally {
 collector.ack(input);
+} catch (Exception ex) {
+collector.reportError(ex);
+collector.fail(input);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e63fb2af/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
--
diff --git a/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java 
b/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
index 2a56f84..c30cba1 100644
--- a/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
@@ -143,7 +143,7 @@ public class KafkaBoltTest {
 String message = value-234;
 Tuple tuple = generateTestTuple(message);
 bolt.execute(tuple);
-verify(collector).ack(tuple);
+verify(collector).fail(tuple);
 }
 
 

Git Push Summary

[ptgoetz]

Repository: storm
Updated Tags:  refs/tags/v0.9.4 [created] d5c4883b1

storm git commit: [maven-release-plugin] prepare for next development iteration

[ptgoetz]

Repository: storm
Updated Branches:
  refs/heads/0.9.3-branch 00091d795 - c248dd98f


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/0.9.3-branch
Commit: c248dd98f681e56ea658a0102d204853f6803adc
Parents: 00091d7
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 14:14:04 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 14:14:04 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/c248dd98/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 338e548..5aef022 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   parent
   artifactIdstorm/artifactId
   groupIdorg.apache.storm/groupId
-  version0.9.4/version
+  version0.9.5-SNAPSHOT/version
   relativePath../../pom.xml/relativePath
   /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/c248dd98/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 62ce62d..ca28c50 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.5-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/c248dd98/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 3251bfa..b449723 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.5-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/c248dd98/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 9ba7e5e..2a368be 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.5-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/c248dd98/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a941931..2b446c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 groupIdorg.apache.storm/groupId
 artifactIdstorm/artifactId
-version0.9.4/version
+version0.9.5-SNAPSHOT/version
 packagingpom/packaging
 nameStorm/name
 descriptionDistributed and fault-tolerant realtime 
computation/description
@@ -166,7 +166,7 @@
 scm
 
connectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/developerConnection
-tagv0.9.4/tag
+tagHEAD/tag
 urlhttps://git-wip-us.apache.org/repos/asf/storm/url
 /scm
 

http://git-wip-us.apache.org/repos/asf/storm/blob/c248dd98/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 73a93ce..e1e13b0 100644
--- 

[4/4] storm git commit: [maven-release-plugin] prepare release v0.9.4

[ptgoetz]

[maven-release-plugin] prepare release v0.9.4


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

Branch: refs/heads/0.9.3-branch
Commit: 00091d7952681a39281aa171adfad133a5e26330
Parents: 61e1b5c
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 14:13:57 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 14:13:57 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/00091d79/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index cd7becb..338e548 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   parent
   artifactIdstorm/artifactId
   groupIdorg.apache.storm/groupId
-  version0.9.4-SNAPSHOT/version
+  version0.9.4/version
   relativePath../../pom.xml/relativePath
   /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/00091d79/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index e687da8..62ce62d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/00091d79/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 9e8d0c4..3251bfa 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/00091d79/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 4d4a871..9ba7e5e 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/00091d79/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6f4d613..a941931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 groupIdorg.apache.storm/groupId
 artifactIdstorm/artifactId
-version0.9.4-SNAPSHOT/version
+version0.9.4/version
 packagingpom/packaging
 nameStorm/name
 descriptionDistributed and fault-tolerant realtime 
computation/description
@@ -166,7 +166,7 @@
 scm
 
connectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/developerConnection
-tagHEAD/tag
+tagv0.9.4/tag
 urlhttps://git-wip-us.apache.org/repos/asf/storm/url
 /scm
 

http://git-wip-us.apache.org/repos/asf/storm/blob/00091d79/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index b5b2098..73a93ce 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
 parent

[2/4] storm git commit: Revert [maven-release-plugin] prepare release v0.9.4

[ptgoetz]

Revert [maven-release-plugin] prepare release v0.9.4

This reverts commit edf596bac8feab0c8721f7de94474e5549858355.


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

Branch: refs/heads/0.9.3-branch
Commit: 233603c3cbd729fdfabd2759bfa7705811996aa4
Parents: 41f44f9
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 14:00:11 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 14:00:11 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/233603c3/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 338e548..cd7becb 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   parent
   artifactIdstorm/artifactId
   groupIdorg.apache.storm/groupId
-  version0.9.4/version
+  version0.9.4-SNAPSHOT/version
   relativePath../../pom.xml/relativePath
   /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/233603c3/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 62ce62d..e687da8 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.4-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/233603c3/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 3251bfa..9e8d0c4 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.4-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/233603c3/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 9ba7e5e..4d4a871 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.4/version
+version0.9.4-SNAPSHOT/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/233603c3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a941931..6f4d613 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 groupIdorg.apache.storm/groupId
 artifactIdstorm/artifactId
-version0.9.4/version
+version0.9.4-SNAPSHOT/version
 packagingpom/packaging
 nameStorm/name
 descriptionDistributed and fault-tolerant realtime 
computation/description
@@ -166,7 +166,7 @@
 scm
 
connectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/developerConnection
-tagv0.9.4/tag
+tagHEAD/tag
 urlhttps://git-wip-us.apache.org/repos/asf/storm/url
 /scm
 

http://git-wip-us.apache.org/repos/asf/storm/blob/233603c3/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 73a93ce..b5b2098 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ 

Git Push Summary

[ptgoetz]

Repository: storm
Updated Tags:  refs/tags/v0.9.4 [created] d6c9db10a

[1/4] storm git commit: Revert [maven-release-plugin] prepare for next development iteration

[ptgoetz]

Repository: storm
Updated Branches:
  refs/heads/0.9.3-branch 48d10e20e - 00091d795


Revert [maven-release-plugin] prepare for next development iteration

This reverts commit 48d10e20eb3c750fc41fcf0bef3d49501cf6d5a4.


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

Branch: refs/heads/0.9.3-branch
Commit: 41f44f9914d4f27d0db3f211a85f88301533f09b
Parents: 48d10e2
Author: P. Taylor Goetz ptgo...@gmail.com
Authored: Wed Mar 18 13:59:39 2015 -0400
Committer: P. Taylor Goetz ptgo...@gmail.com
Committed: Wed Mar 18 13:59:39 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/41f44f99/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 5aef022..338e548 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   parent
   artifactIdstorm/artifactId
   groupIdorg.apache.storm/groupId
-  version0.9.5-SNAPSHOT/version
+  version0.9.4/version
   relativePath../../pom.xml/relativePath
   /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/41f44f99/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index ca28c50..62ce62d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.5-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/41f44f99/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index b449723..3251bfa 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.5-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/41f44f99/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 2a368be..9ba7e5e 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdstorm/artifactId
 groupIdorg.apache.storm/groupId
-version0.9.5-SNAPSHOT/version
+version0.9.4/version
 relativePath../../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/storm/blob/41f44f99/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2b446c1..a941931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 groupIdorg.apache.storm/groupId
 artifactIdstorm/artifactId
-version0.9.5-SNAPSHOT/version
+version0.9.4/version
 packagingpom/packaging
 nameStorm/name
 descriptionDistributed and fault-tolerant realtime 
computation/description
@@ -166,7 +166,7 @@
 scm
 
connectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/storm.git/developerConnection
-tagHEAD/tag
+tagv0.9.4/tag
 urlhttps://git-wip-us.apache.org/repos/asf/storm/url
 /scm
 

http://git-wip-us.apache.org/repos/asf/storm/blob/41f44f99/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 

[16/16] storm git commit: added STORM-634 to Changelog

[bobby]

added STORM-634 to Changelog


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

Branch: refs/heads/master
Commit: bb8d48da29f0b93fe09f91dc3769517d0fdc045f
Parents: 66274f3
Author: Robert (Bobby) Evans ev...@yahoo-inc.com
Authored: Wed Mar 18 14:37:51 2015 -0500
Committer: Robert (Bobby) Evans ev...@yahoo-inc.com
Committed: Wed Mar 18 14:37:51 2015 -0500

--
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/bb8d48da/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f82cd55..3a76053 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,7 @@
  * STORM-696: Single Namespace Test Launching
  * STORM-689: SimpleACLAuthorizer should provide a way to restrict who can 
submit topologies.
  * STORM-541: Build produces maven warnings
+ * STORM-634: Storm serialization changed to thrift to support rolling upgrade.
 
 ## 0.9.3-rc2
  * STORM-558: change swap! to reset! to fix assignment-versions in 
supervisor

[08/16] storm git commit: Merge remote-tracking branch 'upstream/master' into ru

[bobby]

Merge remote-tracking branch 'upstream/master' into ru

Conflicts:
storm-core/src/clj/backtype/storm/bootstrap.clj
storm-core/src/clj/backtype/storm/config.clj
storm-core/src/clj/backtype/storm/daemon/executor.clj
storm-core/src/clj/backtype/storm/daemon/nimbus.clj
storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
storm-core/src/py/storm/ttypes.py


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

Branch: refs/heads/master
Commit: 5b67b571fe45e14fd52b835bc1de056538de1e70
Parents: f23b3c8 5eff2e7
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Thu Mar 5 17:05:33 2015 -0800
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Thu Mar 5 17:05:33 2015 -0800

--
 .gitignore  |4 +-
 BYLAWS.md   |   31 +-
 CHANGELOG.md|   19 +
 DEVELOPER.md|   24 +-
 README.markdown |3 +
 SECURITY.md |   10 +-
 STORM-UI-REST-API.md|   45 +-
 bin/storm-config.cmd|   14 +-
 bin/storm.cmd   |   33 +-
 conf/defaults.yaml  |2 +-
 docs/documentation/Powered-By.md|   83 +
 docs/documentation/Trident-API-Overview.md  |2 +-
 docs/images/architecture.png|  Bin 0 - 69825 bytes
 docs/images/architecture.svg| 1458 +++
 docs/images/bolt.png|  Bin 0 - 24796 bytes
 docs/images/bolt.svg|  743 ++
 docs/images/security.png|  Bin 0 - 72415 bytes
 docs/images/security.svg| 1779 
 docs/images/spout.png   |  Bin 0 - 22911 bytes
 docs/images/spout.svg   |  833 ++
 docs/images/storm.svg   | 1326 +++
 docs/images/topology.png|  Bin 59837 - 64740 bytes
 docs/images/topology.svg| 1044 ++
 docs/images/topology_dark.png   |  Bin 0 - 49692 bytes
 docs/images/topology_dark.svg   | 1101 +++
 .../jvm/storm/starter/BasicDRPCTopology.java|3 +-
 external/storm-hdfs/pom.xml |   18 +-
 .../storm/hdfs/bolt/HdfsFileTopology.java   |6 +-
 .../storm/hdfs/bolt/SequenceFileTopology.java   |4 +-
 .../storm/hdfs/trident/TridentFileTopology.java |2 +-
 .../hdfs/trident/TridentSequenceTopology.java   |6 +-
 external/storm-hive/README.md   |  113 +
 external/storm-hive/pom.xml |  143 +
 .../org/apache/storm/hive/bolt/HiveBolt.java|  289 +
 .../bolt/mapper/DelimitedRecordHiveMapper.java  |  143 +
 .../storm/hive/bolt/mapper/HiveMapper.java  |   81 +
 .../hive/bolt/mapper/JsonRecordHiveMapper.java  |  132 +
 .../apache/storm/hive/common/HiveOptions.java   |  146 +
 .../org/apache/storm/hive/common/HiveUtils.java |   76 +
 .../apache/storm/hive/common/HiveWriter.java|  420 +
 .../apache/storm/hive/trident/HiveState.java|  306 +
 .../storm/hive/trident/HiveStateFactory.java|   31 +
 .../apache/storm/hive/trident/HiveUpdater.java  |   14 +
 .../apache/storm/hive/bolt/HiveSetupUtil.java   |  220 +
 .../apache/storm/hive/bolt/HiveTopology.java|  150 +
 .../hive/bolt/HiveTopologyPartitioned.java  |  153 +
 .../apache/storm/hive/bolt/TestHiveBolt.java|  330 +
 .../storm/hive/common/TestHiveWriter.java   |  193 +
 .../storm/hive/trident/TridentHiveTopology.java |  190 +
 external/storm-jdbc/LICENSE |  202 +
 external/storm-jdbc/README.md   |  240 +
 external/storm-jdbc/pom.xml |  125 +
 .../storm/jdbc/bolt/AbstractJdbcBolt.java   |   57 +
 .../apache/storm/jdbc/bolt/JdbcInsertBolt.java  |   71 +
 .../apache/storm/jdbc/bolt/JdbcLookupBolt.java  |   76 +
 .../org/apache/storm/jdbc/common/Column.java|  111 +
 .../apache/storm/jdbc/common/JdbcClient.java|  228 +
 .../java/org/apache/storm/jdbc/common/Util.java |   75 +
 .../storm/jdbc/mapper/JdbcLookupMapper.java |   26 +
 .../apache/storm/jdbc/mapper/JdbcMapper.java|   33 +
 .../jdbc/mapper/SimpleJdbcLookupMapper.java |   46 +
 .../storm/jdbc/mapper/SimpleJdbcMapper.java |   92 +
 .../storm/jdbc/trident/state/JdbcQuery.java |   40 +
 .../storm/jdbc/trident/state/JdbcState.java |  145 +
 .../jdbc/trident/state/JdbcStateFactory.java|   40 +
 .../storm/jdbc/trident/state/JdbcUpdater.java   |   32 +
 

[12/16] storm git commit: Deleting accidently checked in file. Renaming ZKWorkerHeartbeat to ClusterWorkerHeartbeat.

[bobby]

Deleting accidently checked in file. Renaming ZKWorkerHeartbeat to 
ClusterWorkerHeartbeat.


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

Branch: refs/heads/master
Commit: 5a66bb6d2ffbae8c1b7ea929dcb256413bee5b50
Parents: 539a6a2
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Wed Mar 11 13:04:31 2015 -0700
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Wed Mar 11 13:04:31 2015 -0700

--
 storm-core/src/clj/backtype/storm/cluster.clj   |   4 +-
 storm-core/src/clj/backtype/storm/converter.clj |   6 +-
 .../storm/generated/ClusterWorkerHeartbeat.java | 673 +++
 .../storm/generated/ZKWorkerHeartbeat.java  | 673 ---
 .../jvm/backtype/storm/serialization/Test.java  |  17 -
 storm-core/src/py/storm/ttypes.py   |   4 +-
 storm-core/src/storm.thrift |   3 +-
 7 files changed, 682 insertions(+), 698 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/5a66bb6d/storm-core/src/clj/backtype/storm/cluster.clj
--
diff --git a/storm-core/src/clj/backtype/storm/cluster.clj 
b/storm-core/src/clj/backtype/storm/cluster.clj
index 8866d04..7987a30 100644
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@ -16,7 +16,7 @@
 
 (ns backtype.storm.cluster
   (:import [org.apache.zookeeper.data Stat ACL Id]
-   [backtype.storm.generated SupervisorInfo Assignment StormBase 
ZKWorkerHeartbeat ErrorInfo Credentials]
+   [backtype.storm.generated SupervisorInfo Assignment StormBase 
ClusterWorkerHeartbeat ErrorInfo Credentials]
[java.io Serializable])
   (:import [org.apache.zookeeper KeeperException 
KeeperException$NoNodeException ZooDefs ZooDefs$Ids ZooDefs$Perms])
   (:import [backtype.storm.utils Utils])
@@ -339,7 +339,7 @@
 (let [worker-hb (get-data cluster-state (workerbeat-path storm-id node 
port) false)]
   (if worker-hb
 (- worker-hb
-  (maybe-deserialize ZKWorkerHeartbeat)
+  (maybe-deserialize ClusterWorkerHeartbeat)
   clojurify-zk-worker-hb
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/5a66bb6d/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 e011798..6102ced 100644
--- a/storm-core/src/clj/backtype/storm/converter.clj
+++ b/storm-core/src/clj/backtype/storm/converter.clj
@@ -1,6 +1,6 @@
 (ns backtype.storm.converter
   (:import [backtype.storm.generated SupervisorInfo NodeInfo Assignment
-StormBase TopologyStatus ZKWorkerHeartbeat ExecutorInfo ErrorInfo 
Credentials RebalanceOptions KillOptions TopologyActionOptions])
+StormBase TopologyStatus ClusterWorkerHeartbeat ExecutorInfo 
ErrorInfo Credentials RebalanceOptions KillOptions TopologyActionOptions])
   (:use [backtype.storm util stats log])
   (:require [backtype.storm.daemon [common :as common]]))
 
@@ -158,7 +158,7 @@
 stats))
 {}))
 
-(defn clojurify-zk-worker-hb [^ZKWorkerHeartbeat worker-hb]
+(defn clojurify-zk-worker-hb [^ClusterWorkerHeartbeat worker-hb]
   (if worker-hb
 {:storm-id (.get_storm_id worker-hb)
  :executor-stats (clojurify-stats (into {} (.get_executor_stats 
worker-hb)))
@@ -169,7 +169,7 @@
 
 (defn thriftify-zk-worker-hb [worker-hb]
   (if (not-empty (filter second (:executor-stats worker-hb)))
-(doto (ZKWorkerHeartbeat.)
+(doto (ClusterWorkerHeartbeat.)
   (.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)

http://git-wip-us.apache.org/repos/asf/storm/blob/5a66bb6d/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
--
diff --git 
a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java 
b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
new file mode 100644
index 000..fb04e3a
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
@@ -0,0 +1,673 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache 

[01/16] storm git commit: STORM-634: Converting SupervisorInfo, Assignment, StormBase, TopologyStatus, ZKWorkerHeartbeat, ErrorInfo, Credentials to thrift and defaulting the serialization delegate to

[bobby]

Repository: storm
Updated Branches:
  refs/heads/master 1ea378d78 - bb8d48da2


http://git-wip-us.apache.org/repos/asf/storm/blob/63900643/storm-core/src/py/storm/ttypes.py
--
diff --git a/storm-core/src/py/storm/ttypes.py 
b/storm-core/src/py/storm/ttypes.py
index 1bbaf37..e15cf1d 100644
--- a/storm-core/src/py/storm/ttypes.py
+++ b/storm-core/src/py/storm/ttypes.py
@@ -44,6 +44,26 @@ class TopologyInitialStatus:
 INACTIVE: 2,
   }
 
+class TopologyStatus:
+  ACTIVE = 1
+  INACTIVE = 2
+  REBALANCING = 3
+  KILLED = 4
+
+  _VALUES_TO_NAMES = {
+1: ACTIVE,
+2: INACTIVE,
+3: REBALANCING,
+4: KILLED,
+  }
+
+  _NAMES_TO_VALUES = {
+ACTIVE: 1,
+INACTIVE: 2,
+REBALANCING: 3,
+KILLED: 4,
+  }
+
 
 class JavaObjectArg:
   
@@ -3034,6 +3054,7 @@ class ExecutorStats:
- emitted
- transferred
- specific
+   - rate
   
 
   thrift_spec = (
@@ -3041,15 +3062,17 @@ class ExecutorStats:
 (1, TType.MAP, 'emitted', 
(TType.STRING,None,TType.MAP,(TType.STRING,None,TType.I64,None)), None, ), # 1
 (2, TType.MAP, 'transferred', 
(TType.STRING,None,TType.MAP,(TType.STRING,None,TType.I64,None)), None, ), # 2
 (3, TType.STRUCT, 'specific', (ExecutorSpecificStats, 
ExecutorSpecificStats.thrift_spec), None, ), # 3
+(4, TType.DOUBLE, 'rate', None, None, ), # 4
   )
 
   def __hash__(self):
-return 0 + hash(self.emitted) + hash(self.transferred) + 
hash(self.specific)
+return 0 + hash(self.emitted) + hash(self.transferred) + 
hash(self.specific) + hash(self.rate)
 
-  def __init__(self, emitted=None, transferred=None, specific=None,):
+  def __init__(self, emitted=None, transferred=None, specific=None, 
rate=None,):
 self.emitted = emitted
 self.transferred = transferred
 self.specific = specific
+self.rate = rate
 
   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:
@@ -3100,6 +3123,11 @@ class ExecutorStats:
   self.specific.read(iprot)
 else:
   iprot.skip(ftype)
+  elif fid == 4:
+if ftype == TType.DOUBLE:
+  self.rate = iprot.readDouble();
+else:
+  iprot.skip(ftype)
   else:
 iprot.skip(ftype)
   iprot.readFieldEnd()
@@ -3138,6 +3166,10 @@ class ExecutorStats:
   oprot.writeFieldBegin('specific', TType.STRUCT, 3)
   self.specific.write(oprot)
   oprot.writeFieldEnd()
+if self.rate is not None:
+  oprot.writeFieldBegin('rate', TType.DOUBLE, 4)
+  oprot.writeDouble(self.rate)
+  oprot.writeFieldEnd()
 oprot.writeFieldStop()
 oprot.writeStructEnd()
 
@@ -3148,6 +3180,8 @@ class ExecutorStats:
   raise TProtocol.TProtocolException(message='Required field transferred 
is unset!')
 if self.specific is None:
   raise TProtocol.TProtocolException(message='Required field specific is 
unset!')
+if self.rate is None:
+  raise TProtocol.TProtocolException(message='Required field rate is 
unset!')
 return
 
 
@@ -4383,6 +4417,764 @@ class SubmitOptions:
   def __ne__(self, other):
 return not (self == other)
 
+class SupervisorInfo:
+  
+  Attributes:
+   - time_secs
+   - hostname
+   - assignment_id
+   - used_ports
+   - meta
+   - scheduler_meta
+   - uptime_secs
+  
+
+  thrift_spec = (
+None, # 0
+(1, TType.I64, 'time_secs', None, None, ), # 1
+(2, TType.STRING, 'hostname', None, None, ), # 2
+(3, TType.STRING, 'assignment_id', None, None, ), # 3
+(4, TType.LIST, 'used_ports', (TType.I64,None), None, ), # 4
+(5, TType.LIST, 'meta', (TType.I64,None), None, ), # 5
+(6, TType.MAP, 'scheduler_meta', (TType.STRING,None,TType.STRING,None), 
None, ), # 6
+(7, TType.I64, 'uptime_secs', None, None, ), # 7
+  )
+
+  def __hash__(self):
+return 0 + hash(self.time_secs) + hash(self.hostname) + 
hash(self.assignment_id) + hash(self.used_ports) + hash(self.meta) + 
hash(self.scheduler_meta) + hash(self.uptime_secs)
+
+  def __init__(self, time_secs=None, hostname=None, assignment_id=None, 
used_ports=None, meta=None, scheduler_meta=None, uptime_secs=None,):
+self.time_secs = time_secs
+self.hostname = hostname
+self.assignment_id = assignment_id
+self.used_ports = used_ports
+self.meta = meta
+self.scheduler_meta = scheduler_meta
+self.uptime_secs = uptime_secs
+
+  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:
+  fastbinary.decode_binary(self, iprot.trans, (self.__class__, 
self.thrift_spec))
+  return
+iprot.readStructBegin()
+while True:
+  (fname, ftype, fid) = iprot.readFieldBegin()
+  if ftype == TType.STOP:
+break
+  if 

[14/16] storm git commit: Fixing a failing unit test.

[bobby]

Fixing a failing unit test.


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

Branch: refs/heads/master
Commit: 93b1b656013a941b03c51936ea2c95cd7952fbc5
Parents: 47bcf3e
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Wed Mar 18 10:34:56 2015 -0700
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Wed Mar 18 10:34:56 2015 -0700

--
 .../src/jvm/backtype/storm/coordination/BatchBoltExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/93b1b656/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
--
diff --git 
a/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java 
b/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
index 89ef028..8653010 100644
--- a/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
+++ b/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
@@ -103,6 +103,6 @@ public class BatchBoltExecutor implements IRichBolt, 
FinishedCallback, TimeoutCa
 }
 
 private IBatchBolt newTransactionalBolt() {
-return Utils.deserialize(_boltSer, IBatchBolt.class);
+return Utils.javaDeserialize(_boltSer, IBatchBolt.class);
 }
 }

[06/16] storm git commit: Using java serialization for all places where the contract with customer is to use java serialization.

[bobby]

Using java serialization for all places where the contract with customer is to 
use java serialization.


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

Branch: refs/heads/master
Commit: 431976607857d5d29913ba055082a546a22be16e
Parents: 0571e22
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Tue Feb 17 10:57:25 2015 -0800
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Tue Feb 17 10:57:25 2015 -0800

--
 storm-core/src/clj/backtype/storm/config.clj |  2 +-
 storm-core/src/clj/backtype/storm/thrift.clj | 10 +-
 .../src/jvm/backtype/storm/topology/TopologyBuilder.java |  4 ++--
 storm-core/src/jvm/backtype/storm/utils/LocalState.java  |  4 ++--
 storm-core/src/jvm/backtype/storm/utils/Utils.java   | 11 ++-
 storm-core/src/jvm/storm/trident/Stream.java |  2 +-
 storm-core/src/jvm/storm/trident/TridentTopology.java|  4 ++--
 7 files changed, 23 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/43197660/storm-core/src/clj/backtype/storm/config.clj
--
diff --git a/storm-core/src/clj/backtype/storm/config.clj 
b/storm-core/src/clj/backtype/storm/config.clj
index d09b31b..00396c7 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -212,7 +212,7 @@
   (let [stormroot (supervisor-stormdist-root conf storm-id)
 conf-path (supervisor-stormconf-path stormroot)
 topology-path (supervisor-stormcode-path stormroot)]
-(merge conf (Utils/deserialize (FileUtils/readFileToByteArray (File. 
conf-path)) java.util.Map))
+(merge conf (Utils/javaDeserialize (FileUtils/readFileToByteArray (File. 
conf-path)) java.util.Map))
 ))
 
 (defn read-supervisor-topology

http://git-wip-us.apache.org/repos/asf/storm/blob/43197660/storm-core/src/clj/backtype/storm/thrift.clj
--
diff --git a/storm-core/src/clj/backtype/storm/thrift.clj 
b/storm-core/src/clj/backtype/storm/thrift.clj
index 5bc1150..0ff6dd0 100644
--- a/storm-core/src/clj/backtype/storm/thrift.clj
+++ b/storm-core/src/clj/backtype/storm/thrift.clj
@@ -122,7 +122,7 @@
 
 (defnk mk-spout-spec*
   [spout outputs :p nil :conf nil]
-  (SpoutSpec. (ComponentObject/serialized_java (Utils/serialize spout))
+  (SpoutSpec. (ComponentObject/serialized_java (Utils/javaSerialize spout))
   (mk-plain-component-common {} outputs p :conf conf)))
 
 (defn mk-shuffle-grouping
@@ -157,11 +157,11 @@
   [^ComponentObject obj]
   (when (not= (.getSetField obj) ComponentObject$_Fields/SERIALIZED_JAVA)
 (throw (RuntimeException. Cannot deserialize non-java-serialized 
object)))
-  (Utils/deserialize (.get_serialized_java obj) Serializable))
+  (Utils/javaDeserialize (.get_serialized_java obj) Serializable))
 
 (defn serialize-component-object
   [obj]
-  (ComponentObject/serialized_java (Utils/serialize obj)))
+  (ComponentObject/serialized_java (Utils/javaSerialize obj)))
 
 (defn- mk-grouping
   [grouping-spec]
@@ -172,7 +172,7 @@
 grouping-spec
 
 (instance? CustomStreamGrouping grouping-spec)
-(Grouping/custom_serialized (Utils/serialize grouping-spec))
+(Grouping/custom_serialized (Utils/javaSerialize grouping-spec))
 
 (instance? JavaObject grouping-spec)
 (Grouping/custom_object grouping-spec)
@@ -212,7 +212,7 @@
 (defnk mk-bolt-spec*
   [inputs bolt outputs :p nil :conf nil]
   (let [common (mk-plain-component-common (mk-inputs inputs) outputs p :conf 
conf)]
-(Bolt. (ComponentObject/serialized_java (Utils/serialize bolt))
+(Bolt. (ComponentObject/serialized_java (Utils/javaSerialize bolt))
common)))
 
 (defnk mk-spout-spec

http://git-wip-us.apache.org/repos/asf/storm/blob/43197660/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
--
diff --git a/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java 
b/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
index 0a47626..9d8f271 100644
--- a/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
+++ b/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
@@ -104,12 +104,12 @@ public class TopologyBuilder {
 for(String boltId: _bolts.keySet()) {
 IRichBolt bolt = _bolts.get(boltId);
 ComponentCommon common = getComponentCommon(boltId, bolt);
-boltSpecs.put(boltId, new 

[07/16] storm git commit: Handling the case where executor stats can be null on initialization.

[bobby]

Handling the case where executor stats can be null on initialization.


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

Branch: refs/heads/master
Commit: f23b3c8719b94fa7af04ac2138479842c449deab
Parents: 4319766
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Thu Mar 5 16:57:17 2015 -0800
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Thu Mar 5 16:57:17 2015 -0800

--
 storm-core/src/clj/backtype/storm/cluster.clj   | 12 +++-
 storm-core/src/clj/backtype/storm/converter.clj |  9 +
 2 files changed, 12 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/f23b3c87/storm-core/src/clj/backtype/storm/cluster.clj
--
diff --git a/storm-core/src/clj/backtype/storm/cluster.clj 
b/storm-core/src/clj/backtype/storm/cluster.clj
index 1d5026f..8866d04 100644
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@ -336,10 +336,11 @@
 
   (get-worker-heartbeat
 [this storm-id node port]
-(- cluster-state
-(get-data (workerbeat-path storm-id node port) false)
-  (maybe-deserialize ZKWorkerHeartbeat)
-  clojurify-zk-worker-hb))
+(let [worker-hb (get-data cluster-state (workerbeat-path storm-id node 
port) false)]
+  (if worker-hb
+(- worker-hb
+  (maybe-deserialize ZKWorkerHeartbeat)
+  clojurify-zk-worker-hb
 
 
   (executor-beats
@@ -368,7 +369,8 @@
   (worker-heartbeat!
 [this storm-id node port info]
 (let [thrift-worker-hb (thriftify-zk-worker-hb info)]
-  (set-data cluster-state (workerbeat-path storm-id node port) 
(Utils/serialize thrift-worker-hb) acls)))
+  (if thrift-worker-hb
+(set-data cluster-state (workerbeat-path storm-id node port) 
(Utils/serialize thrift-worker-hb) acls
 
   (remove-worker-heartbeat!
 [this storm-id node port]

http://git-wip-us.apache.org/repos/asf/storm/blob/f23b3c87/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 6a9f4a6..e011798 100644
--- a/storm-core/src/clj/backtype/storm/converter.clj
+++ b/storm-core/src/clj/backtype/storm/converter.clj
@@ -168,10 +168,11 @@
 {}))
 
 (defn thriftify-zk-worker-hb [worker-hb]
-  (doto (ZKWorkerHeartbeat.)
-(.set_storm_id (:storm-id worker-hb))
-(.set_executor_stats (thriftify-stats (:executor-stats worker-hb)))
-(.set_time_secs (:time-secs worker-hb
+  (if (not-empty (filter second (:executor-stats worker-hb)))
+(doto (ZKWorkerHeartbeat.)
+  (.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)
 
 (defn clojurify-error [^ErrorInfo error]
   (if error

[04/16] storm git commit: STORM-634: Converting SupervisorInfo, Assignment, StormBase, TopologyStatus, ZKWorkerHeartbeat, ErrorInfo, Credentials to thrift and defaulting the serialization delegate to

[bobby]

STORM-634: Converting 
SupervisorInfo,Assignment,StormBase,TopologyStatus,ZKWorkerHeartbeat,ErrorInfo,Credentials
 to thrift and defaulting the serialization delegate to thrift serialization. 
Added class as a param to serialization delegate interface.


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

Branch: refs/heads/master
Commit: 639006432c658226bd33dc2ae607f121f3dc02bb
Parents: a115c9d
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Thu Jan 29 13:46:01 2015 -0800
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Tue Feb 3 11:52:15 2015 -0800

--
 conf/defaults.yaml  |2 +-
 storm-core/src/clj/backtype/storm/bootstrap.clj |2 +-
 storm-core/src/clj/backtype/storm/cluster.clj   |   47 +-
 storm-core/src/clj/backtype/storm/config.clj|7 +-
 storm-core/src/clj/backtype/storm/converter.clj |  200 
 .../src/clj/backtype/storm/daemon/common.clj|   10 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |6 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj|  105 +-
 .../src/clj/backtype/storm/daemon/worker.clj|2 +-
 storm-core/src/clj/backtype/storm/stats.clj |   78 +-
 storm-core/src/clj/backtype/storm/thrift.clj|9 +-
 .../storm/coordination/BatchBoltExecutor.java   |2 +-
 .../backtype/storm/generated/Assignment.java|  817 +
 .../backtype/storm/generated/ExecutorStats.java |  125 +-
 .../jvm/backtype/storm/generated/NodeInfo.java  |  479 
 .../jvm/backtype/storm/generated/StormBase.java | 1078 ++
 .../storm/generated/SupervisorInfo.java | 1030 +
 .../storm/generated/TopologyActionOptions.java  |  335 ++
 .../storm/generated/TopologyStatus.java |   67 ++
 .../storm/generated/ZKWorkerHeartbeat.java  |  586 ++
 .../DefaultSerializationDelegate.java   |   10 +-
 .../GzipBridgeSerializationDelegate.java|6 +-
 .../GzipSerializationDelegate.java  |   10 +-
 .../serialization/SerializationDelegate.java|2 +-
 .../jvm/backtype/storm/serialization/Test.java  |   17 +
 .../ThriftSerializationDelegate.java|   52 +
 .../ThriftSerializationDelegateBridge.java  |   51 +
 .../jvm/backtype/storm/utils/LocalState.java|2 +-
 .../src/jvm/backtype/storm/utils/Utils.java |   56 +-
 .../src/jvm/storm/trident/TridentTopology.java  |4 +-
 storm-core/src/py/storm/ttypes.py   |  796 -
 storm-core/src/storm.thrift |   51 +
 .../test/clj/backtype/storm/cluster_test.clj|   25 +-
 .../test/clj/backtype/storm/nimbus_test.clj |6 +-
 .../GzipBridgeSerializationDelegateTest.java|6 +-
 .../ThriftBridgeSerializationDelegateTest.java  |   79 ++
 36 files changed, 5957 insertions(+), 203 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/63900643/conf/defaults.yaml
--
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 35d20ff..141e1d3 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -47,7 +47,7 @@ storm.auth.simple-white-list.users: []
 storm.auth.simple-acl.users: []
 storm.auth.simple-acl.users.commands: []
 storm.auth.simple-acl.admins: []
-storm.meta.serialization.delegate: 
backtype.storm.serialization.DefaultSerializationDelegate
+storm.meta.serialization.delegate: 
backtype.storm.serialization.ThriftSerializationDelegateBridge
 
 ### nimbus.* configs are for the master
 nimbus.host: localhost

http://git-wip-us.apache.org/repos/asf/storm/blob/63900643/storm-core/src/clj/backtype/storm/bootstrap.clj
--
diff --git a/storm-core/src/clj/backtype/storm/bootstrap.clj 
b/storm-core/src/clj/backtype/storm/bootstrap.clj
index c1063cf..bc08e41 100644
--- a/storm-core/src/clj/backtype/storm/bootstrap.clj
+++ b/storm-core/src/clj/backtype/storm/bootstrap.clj
@@ -57,7 +57,7 @@
  KillOptions SubmitOptions RebalanceOptions JavaObject 
JavaObjectArg
  TopologyInitialStatus AuthorizationException]))
  (import (quote [backtype.storm.daemon.common StormBase Assignment
- SupervisorInfo WorkerHeartbeat]))
+ SupervisorInfo]))
  (import (quote [backtype.storm.grouping CustomStreamGrouping]))
  (import (quote [java.io File FileOutputStream FileInputStream]))
  (import (quote [java.util Collection List Random Map HashMap Collections 
ArrayList LinkedList]))

[13/16] storm git commit: Deprecating DefaultSerializer and DefaultSerializerBridge in favor of ThriftSerializer.

[bobby]

Deprecating DefaultSerializer and DefaultSerializerBridge in favor of 
ThriftSerializer.


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

Branch: refs/heads/master
Commit: 47bcf3ebe7067e86846057cbca2466d7349b0d98
Parents: 5a66bb6
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Wed Mar 11 14:06:49 2015 -0700
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Wed Mar 11 14:06:49 2015 -0700

--
 conf/defaults.yaml  |  2 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |  2 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj|  4 +-
 .../storm/coordination/BatchBoltExecutor.java   |  2 +-
 .../DefaultSerializationDelegate.java   |  1 +
 .../GzipBridgeSerializationDelegate.java|  1 +
 .../ThriftSerializationDelegateBridge.java  | 51 
 .../storm/topology/TopologyBuilder.java |  2 +-
 .../src/jvm/backtype/storm/utils/Utils.java | 23 +++--
 .../ThriftBridgeSerializationDelegateTest.java  | 21 +---
 10 files changed, 29 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/47bcf3eb/conf/defaults.yaml
--
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 0255a55..dfdb54b 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -47,7 +47,7 @@ storm.auth.simple-white-list.users: []
 storm.auth.simple-acl.users: []
 storm.auth.simple-acl.users.commands: []
 storm.auth.simple-acl.admins: []
-storm.meta.serialization.delegate: 
backtype.storm.serialization.ThriftSerializationDelegateBridge
+storm.meta.serialization.delegate: 
backtype.storm.serialization.ThriftSerializationDelegate
 
 ### nimbus.* configs are for the master
 nimbus.host: localhost

http://git-wip-us.apache.org/repos/asf/storm/blob/47bcf3eb/storm-core/src/clj/backtype/storm/daemon/executor.clj
--
diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj 
b/storm-core/src/clj/backtype/storm/daemon/executor.clj
index 0e083ea..7f688ed 100644
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@ -96,7 +96,7 @@
 (let [grouping (thrift/instantiate-java-object (.get_custom_object 
thrift-grouping))]
   (mk-custom-grouper grouping context component-id stream-id 
target-tasks))
   :custom-serialized
-(let [grouping (Utils/deserialize (.get_custom_serialized 
thrift-grouping) Serializable)]
+(let [grouping (Utils/javaDeserialize (.get_custom_serialized 
thrift-grouping) Serializable)]
   (mk-custom-grouper grouping context component-id stream-id 
target-tasks))
   :direct
 :direct

http://git-wip-us.apache.org/repos/asf/storm/blob/47bcf3eb/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 fdc54cc..9112365 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -107,7 +107,7 @@
 (defn- read-storm-conf [conf storm-id]
   (let [stormroot (master-stormdist-root conf storm-id)]
 (merge conf
-   (Utils/deserialize
+   (Utils/javaDeserialize
 (FileUtils/readFileToByteArray
  (File. (master-stormconf-path stormroot))
  ) java.util.Map
@@ -322,7 +322,7 @@
(FileUtils/cleanDirectory (File. stormroot))
(setup-jar conf tmp-jar-location stormroot)
(FileUtils/writeByteArrayToFile (File. (master-stormcode-path stormroot)) 
(Utils/serialize topology))
-   (FileUtils/writeByteArrayToFile (File. (master-stormconf-path stormroot)) 
(Utils/serialize storm-conf))
+   (FileUtils/writeByteArrayToFile (File. (master-stormconf-path stormroot)) 
(Utils/javaSerialize storm-conf))
))
 
 (defn- read-storm-topology [conf storm-id]

http://git-wip-us.apache.org/repos/asf/storm/blob/47bcf3eb/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
--
diff --git 
a/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java 
b/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
index 3d3208b..89ef028 100644
--- a/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
+++ b/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
@@ -41,7 +41,7 @@ public class 

[03/16] storm git commit: STORM-634: Converting SupervisorInfo, Assignment, StormBase, TopologyStatus, ZKWorkerHeartbeat, ErrorInfo, Credentials to thrift and defaulting the serialization delegate to

[bobby]

http://git-wip-us.apache.org/repos/asf/storm/blob/63900643/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
--
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java 
b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
index a297fa7..15d629e 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
@@ -44,16 +44,19 @@ public class ExecutorStats implements 
org.apache.thrift.TBaseExecutorStats, Exe
   private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = 
new org.apache.thrift.protocol.TField(emitted, 
org.apache.thrift.protocol.TType.MAP, (short)1);
   private static final org.apache.thrift.protocol.TField 
TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField(transferred, 
org.apache.thrift.protocol.TType.MAP, (short)2);
   private static final org.apache.thrift.protocol.TField SPECIFIC_FIELD_DESC = 
new org.apache.thrift.protocol.TField(specific, 
org.apache.thrift.protocol.TType.STRUCT, (short)3);
+  private static final org.apache.thrift.protocol.TField RATE_FIELD_DESC = new 
org.apache.thrift.protocol.TField(rate, 
org.apache.thrift.protocol.TType.DOUBLE, (short)4);
 
   private MapString,MapString,Long emitted; // required
   private MapString,MapString,Long transferred; // required
   private ExecutorSpecificStats specific; // required
+  private double rate; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 EMITTED((short)1, emitted),
 TRANSFERRED((short)2, transferred),
-SPECIFIC((short)3, specific);
+SPECIFIC((short)3, specific),
+RATE((short)4, rate);
 
 private static final MapString, _Fields byName = new HashMapString, 
_Fields();
 
@@ -74,6 +77,8 @@ public class ExecutorStats implements 
org.apache.thrift.TBaseExecutorStats, Exe
   return TRANSFERRED;
 case 3: // SPECIFIC
   return SPECIFIC;
+case 4: // RATE
+  return RATE;
 default:
   return null;
   }
@@ -114,24 +119,28 @@ public class ExecutorStats implements 
org.apache.thrift.TBaseExecutorStats, Exe
   }
 
   // isset id assignments
+  private static final int __RATE_ISSET_ID = 0;
+  private BitSet __isset_bit_vector = new BitSet(1);
 
   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);
-tmpMap.put(_Fields.EMITTED, new 
org.apache.thrift.meta_data.FieldMetaData(emitted, 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
 
+tmpMap.put(_Fields.EMITTED, new 
org.apache.thrift.meta_data.FieldMetaData(emitted, 
org.apache.thrift.TFieldRequirementType.REQUIRED,
+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.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.I64);
-tmpMap.put(_Fields.TRANSFERRED, new 
org.apache.thrift.meta_data.FieldMetaData(transferred, 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
 
+tmpMap.put(_Fields.TRANSFERRED, new 
org.apache.thrift.meta_data.FieldMetaData(transferred, 
org.apache.thrift.TFieldRequirementType.REQUIRED,
+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.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+new 

[05/16] storm git commit: Merge remote-tracking branch 'upstream/master' into ru

[bobby]

Merge remote-tracking branch 'upstream/master' into ru

Conflicts:
storm-core/src/clj/backtype/storm/cluster.clj
storm-core/src/py/storm/ttypes.py
storm-core/src/storm.thrift


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

Branch: refs/heads/master
Commit: 0571e22c15a1214c3e08510fddad608571f6a6d8
Parents: 6390064 8036109
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Mon Feb 9 12:47:36 2015 -0800
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Mon Feb 9 12:47:36 2015 -0800

--
 CHANGELOG.md|   9 +
 README.markdown |   8 +-
 STORM-UI-REST-API.md|  21 +
 dev-tools/github/__init__.py|  11 +
 dev-tools/jira-github-join.py   |   4 +-
 dev-tools/storm-merge.py|  31 +
 docs/README.md  |   9 +
 docs/documentation/Common-patterns.md   |  14 +-
 docs/documentation/Concepts.md  |  13 +-
 docs/documentation/Home.md  |   2 +-
 docs/documentation/Multilang-protocol.md|   4 +-
 docs/documentation/Powered-By.md|   4 +-
 .../storm/starter/SkewedRollingTopWords.java| 134 +++
 .../storm/starter/bolt/RollingCountAggBolt.java |  78 ++
 pom.xml |  11 +
 storm-core/src/clj/backtype/storm/cluster.clj   |  43 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj |   5 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj|  35 +-
 .../src/clj/backtype/storm/daemon/worker.clj|   6 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  34 +-
 .../coordination/BatchSubtopologyBuilder.java   |  11 +
 .../storm/drpc/LinearDRPCInputDeclarer.java |   5 +-
 .../storm/drpc/LinearDRPCTopologyBuilder.java   |  13 +-
 .../storm/generated/GetInfoOptions.java | 350 +++
 .../jvm/backtype/storm/generated/Nimbus.java| 974 +++
 .../storm/generated/NumErrorsChoice.java|  64 ++
 .../storm/grouping/PartialKeyGrouping.java  |  31 +-
 .../backtype/storm/topology/InputDeclarer.java  |   3 +
 .../storm/topology/TopologyBuilder.java |  11 +
 .../TransactionalTopologyBuilder.java   |  13 +-
 .../src/jvm/backtype/storm/utils/Monitor.java   |   8 +-
 .../topology/TridentTopologyBuilder.java|  13 +-
 storm-core/src/py/storm/DistributedRPC-remote   |   0
 .../py/storm/DistributedRPCInvocations-remote   |   0
 storm-core/src/py/storm/Nimbus-remote   |   7 +
 storm-core/src/py/storm/Nimbus.py   | 226 +
 storm-core/src/py/storm/ttypes.py   |  80 ++
 storm-core/src/storm.thrift |  10 +
 .../clj/backtype/storm/integration_test.clj |  10 +-
 .../storm/grouping/PartialKeyGroupingTest.java  |  26 +-
 40 files changed, 2272 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/0571e22c/storm-core/src/clj/backtype/storm/cluster.clj
--
diff --cc storm-core/src/clj/backtype/storm/cluster.clj
index 15bf8a3,4b73f2e..1d5026f
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@@ -230,11 -239,11 +241,11 @@@
(cb id
  
  (defn- maybe-deserialize
 -  [ser]
 +  [ser clazz]
(when ser
 -(Utils/deserialize ser)))
 +(Utils/deserialize ser clazz)))
  
- (defstruct TaskError :error :time-secs :host :port)
+ (defrecord TaskError [error time-secs host port])
  
  (defn- parse-error-path
[^String p]
@@@ -440,9 -441,13 +451,13 @@@
(report-error
   [this storm-id component-id node port error]
   (let [path (error-path storm-id component-id)
+last-error-path (last-error-path storm-id component-id)
 -   data {:time-secs (current-time-secs) :error (stringify-error 
error) :host node :port port}
 +   data (thriftify-error {:time-secs (current-time-secs) :error 
(stringify-error error) :host node :port port})
 _ (mkdirs cluster-state path acls)
-_ (create-sequential cluster-state (str path /e) 
(Utils/serialize data) acls)
+ser-data (Utils/serialize data)
+_ (mkdirs cluster-state path acls)
+_ (create-sequential cluster-state (str path /e) ser-data 
acls)
+_ (set-data cluster-state last-error-path ser-data acls)
 to-kill (- (get-children cluster-state path false)
  (sort-by parse-error-path)
 

[11/16] storm git commit: Regenrated the files using thrift-0.9.2 and fixed some bugs introduced by upmerging.

[bobby]

Regenrated the files using thrift-0.9.2 and fixed some bugs introduced by 
upmerging.


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

Branch: refs/heads/master
Commit: 539a6a21464acada9d051b3d5ce67990ffa2a239
Parents: 5b67b57
Author: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Authored: Thu Mar 5 17:21:54 2015 -0800
Committer: Parth Brahmbhatt brahmbhatt.pa...@gmail.com
Committed: Thu Mar 5 22:01:14 2015 -0800

--
 storm-core/src/clj/backtype/storm/config.clj|   2 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj|   2 +-
 .../src/clj/backtype/storm/daemon/worker.clj|   1 -
 .../backtype/storm/generated/Assignment.java| 626 --
 .../backtype/storm/generated/ExecutorStats.java | 105 ++-
 .../jvm/backtype/storm/generated/NodeInfo.java  | 245 --
 .../jvm/backtype/storm/generated/StormBase.java | 577 -
 .../storm/generated/SupervisorInfo.java | 648 +--
 .../storm/generated/TopologyActionOptions.java  |  76 +-
 .../storm/generated/TopologyStatus.java |   3 +-
 .../storm/generated/ZKWorkerHeartbeat.java  | 307 ---
 storm-core/src/py/storm/ttypes.py   | 827 ++-
 12 files changed, 2505 insertions(+), 914 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/539a6a21/storm-core/src/clj/backtype/storm/config.clj
--
diff --git a/storm-core/src/clj/backtype/storm/config.clj 
b/storm-core/src/clj/backtype/storm/config.clj
index 5e7893b..a345daf 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -212,7 +212,7 @@
   (let [stormroot (supervisor-stormdist-root conf storm-id)
 conf-path (supervisor-stormconf-path stormroot)
 topology-path (supervisor-stormcode-path stormroot)]
-(merge conf (clojurify-structure (Utils/javaDeserialize 
(FileUtils/readFileToByteArray (File. conf-path)))
+(merge conf (clojurify-structure (Utils/javaDeserialize 
(FileUtils/readFileToByteArray (File. conf-path)) java.util.Map)
 
 (defn read-supervisor-topology
   [conf storm-id]

http://git-wip-us.apache.org/repos/asf/storm/blob/539a6a21/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 2c7b82c..fdc54cc 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -19,7 +19,7 @@
   (:import [org.apache.thrift.exception])
   (:import [org.apache.thrift.transport TNonblockingServerTransport 
TNonblockingServerSocket])
   (:import [org.apache.commons.io FileUtils])
-  (:import [java.nio ByteBuffer])
+  (:import [java.nio ByteBuffer]
[java.util Collections HashMap])
   (:import [java.io FileNotFoundException File FileOutputStream])
   (:import [java.nio.channels Channels WritableByteChannel])

http://git-wip-us.apache.org/repos/asf/storm/blob/539a6a21/storm-core/src/clj/backtype/storm/daemon/worker.clj
--
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj 
b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index 88b14d8..e0263d6 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -25,7 +25,6 @@
   (:import [backtype.storm.utils Utils TransferDrainer ThriftTopologyUtils])
   (:import [backtype.storm.messaging TransportFactory])
   (:import [backtype.storm.messaging TaskMessage IContext IConnection 
ConnectionWithStatus ConnectionWithStatus$Status])
-  (:import [backtype.storm.daemon.common WorkerHeartbeat])
   (:import [backtype.storm.daemon Shutdownable])
   (:import [backtype.storm.serialization KryoTupleSerializer])
   (:import [backtype.storm.generated StormTopology])

http://git-wip-us.apache.org/repos/asf/storm/blob/539a6a21/storm-core/src/jvm/backtype/storm/generated/Assignment.java
--
diff --git a/storm-core/src/jvm/backtype/storm/generated/Assignment.java 
b/storm-core/src/jvm/backtype/storm/generated/Assignment.java
index b6ade94..2e6e8a3 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Assignment.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Assignment.java
@@ -16,13 +16,24 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
 

[15/16] storm git commit: Merge branch 'STORM-634' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-634

[bobby]

Merge branch 'STORM-634' of https://github.com/Parth-Brahmbhatt/incubator-storm 
into STORM-634

STORM-634: Storm serialization changed to thrift to support rolling upgrade.


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

Branch: refs/heads/master
Commit: 66274f342c8d35e4e952f2d22a6250a1a6760287
Parents: 1ea378d 93b1b65
Author: Robert (Bobby) Evans ev...@yahoo-inc.com
Authored: Wed Mar 18 14:20:15 2015 -0500
Committer: Robert (Bobby) Evans ev...@yahoo-inc.com
Committed: Wed Mar 18 14:20:15 2015 -0500

--
 conf/defaults.yaml  |2 +-
 storm-core/src/clj/backtype/storm/cluster.clj   |   58 +-
 storm-core/src/clj/backtype/storm/config.clj|7 +-
 storm-core/src/clj/backtype/storm/converter.clj |  201 +++
 .../src/clj/backtype/storm/daemon/common.clj|   10 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |4 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj|  106 +-
 .../src/clj/backtype/storm/daemon/worker.clj|3 +-
 storm-core/src/clj/backtype/storm/stats.clj |   78 +-
 storm-core/src/clj/backtype/storm/thrift.clj|   17 +-
 .../storm/coordination/BatchBoltExecutor.java   |4 +-
 .../backtype/storm/generated/Assignment.java|  983 ++
 .../storm/generated/ClusterWorkerHeartbeat.java |  673 ++
 .../backtype/storm/generated/ExecutorStats.java |  105 +-
 .../jvm/backtype/storm/generated/NodeInfo.java  |  556 
 .../jvm/backtype/storm/generated/StormBase.java | 1211 ++
 .../storm/generated/SupervisorInfo.java | 1182 +
 .../storm/generated/TopologyActionOptions.java  |  387 ++
 .../storm/generated/TopologyStatus.java |   68 +
 .../DefaultSerializationDelegate.java   |   11 +-
 .../GzipBridgeSerializationDelegate.java|7 +-
 .../GzipSerializationDelegate.java  |   10 +-
 .../serialization/SerializationDelegate.java|2 +-
 .../ThriftSerializationDelegate.java|   52 +
 .../storm/topology/TopologyBuilder.java |6 +-
 .../jvm/backtype/storm/utils/LocalState.java|4 +-
 .../src/jvm/backtype/storm/utils/Utils.java |   82 +-
 storm-core/src/jvm/storm/trident/Stream.java|2 +-
 .../src/jvm/storm/trident/TridentTopology.java  |6 +-
 storm-core/src/py/storm/ttypes.py   |  827 +++-
 storm-core/src/storm.thrift |   51 +
 .../test/clj/backtype/storm/cluster_test.clj|   25 +-
 .../test/clj/backtype/storm/nimbus_test.clj |6 +-
 .../GzipBridgeSerializationDelegateTest.java|6 +-
 .../ThriftBridgeSerializationDelegateTest.java  |   60 +
 35 files changed, 6606 insertions(+), 206 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/66274f34/conf/defaults.yaml
--

http://git-wip-us.apache.org/repos/asf/storm/blob/66274f34/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
--

http://git-wip-us.apache.org/repos/asf/storm/blob/66274f34/storm-core/src/clj/backtype/storm/thrift.clj
--