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 2014/06/13 21:47:46 UTC

[1/2] git commit: STORM-352: fix logic for writing offsets to ZooKeeper

Repository: incubator-storm
Updated Branches:
  refs/heads/master 87a16c1a8 -> 31a1592f7


STORM-352: fix logic for writing offsets to ZooKeeper


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

Branch: refs/heads/master
Commit: 57851bb6be4caec950541bcb1f01529224e52af4
Parents: d448e34
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Jun 13 14:01:32 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Jun 13 14:13:50 2014 -0400

----------------------------------------------------------------------
 external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/57851bb6/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index d868e50..2c32a2c 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -214,7 +214,7 @@ public class PartitionManager {
 
     public void commit() {
         long lastCompletedOffset = lastCompletedOffset();
-        if (lastCompletedOffset != lastCompletedOffset) {
+        if (_committedTo != lastCompletedOffset) {
             LOG.debug("Writing last completed offset (" + lastCompletedOffset + ") to ZK for " + _partition + " for topology: " + _topologyInstanceId);
             Map<Object, Object> data = (Map<Object, Object>) ImmutableMap.builder()
                     .put("topology", ImmutableMap.of("id", _topologyInstanceId,

[2/2] git commit: Merge branch 'STORM-352'

Posted by pt...@apache.org.
Merge branch 'STORM-352'


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

Branch: refs/heads/master
Commit: 31a1592f743d0efb5d393374d01e3eda9145cfff
Parents: 87a16c1 57851bb
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Jun 13 15:12:24 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Jun 13 15:12:24 2014 -0400

----------------------------------------------------------------------
 external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------