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/03/18 16:28:29 UTC
[1/7] storm git commit: STORM-693: when bolt fails to write tuple,
it should report error instead of silently acking.
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 <pt...@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 <br...@gmail.com>
Authored: Mon Mar 2 16:06:58 2015 -0800
Committer: P. Taylor Goetz <pt...@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 KafkaBolt<K, 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);
}
[3/7] storm git commit: STORM-682: supervisor should handle worker
state corruption gracefully.
Posted by pt...@apache.org.
STORM-682: supervisor should handle worker state corruption gracefully.
Signed-off-by: P. Taylor Goetz <pt...@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 <br...@gmail.com>
Authored: Fri Feb 20 11:56:22 2015 -0800
Committer: P. Taylor Goetz <pt...@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
Posted by pt...@apache.org.
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 <pt...@gmail.com>
Authored: Wed Mar 18 10:59:56 2015 -0400
Committer: P. Taylor Goetz <pt...@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.
[4/7] storm git commit: add STORM-682 to changelog
Posted by pt...@apache.org.
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 <pt...@gmail.com>
Authored: Wed Mar 18 11:05:30 2015 -0400
Committer: P. Taylor Goetz <pt...@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.
[5/7] storm git commit: STORM-559: ZkHosts in README should use 2181
as port.
Posted by pt...@apache.org.
STORM-559: ZkHosts in README should use 2181 as port.
Signed-off-by: P. Taylor Goetz <pt...@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 <br...@gmail.com>
Authored: Wed Jan 14 12:27:35 2015 -0800
Committer: P. Taylor Goetz <pt...@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
[6/7] storm git commit: add STORM-559 to changelog
Posted by pt...@apache.org.
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 <pt...@gmail.com>
Authored: Wed Mar 18 11:11:16 2015 -0400
Committer: P. Taylor Goetz <pt...@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
[7/7] storm git commit: add missing import in supervisor.clj
Posted by pt...@apache.org.
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 <pt...@gmail.com>
Authored: Wed Mar 18 11:28:11 2015 -0400
Committer: P. Taylor Goetz <pt...@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])