You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/02/23 18:08:30 UTC
[1/2] storm git commit: update PartitionManager.java
Repository: storm
Updated Branches:
refs/heads/master 348d480be -> 0eb5f30e9
update PartitionManager.java
fix wrong output in log when committed offset is too far behind latest offset
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fa429b2a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fa429b2a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fa429b2a
Branch: refs/heads/master
Commit: fa429b2a1669f3f55e8a399bd1c64a51bead09e2
Parents: 348d480
Author: hs <pe...@gmail.com>
Authored: Thu Nov 27 18:16:23 2014 +0800
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Feb 23 11:07:30 2015 -0600
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fa429b2a/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 63e70cf..630c7f6 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -101,9 +101,10 @@ public class PartitionManager {
if (currentOffset - _committedTo > spoutConfig.maxOffsetBehind || _committedTo <= 0) {
LOG.info("Last commit offset from zookeeper: " + _committedTo);
+ Long lastCommittedOffset = _committedTo;
_committedTo = currentOffset;
- LOG.info("Commit offset " + _committedTo + " is more than " +
- spoutConfig.maxOffsetBehind + " behind, resetting to startOffsetTime=" + spoutConfig.startOffsetTime);
+ LOG.info("Commit offset " + lastCommittedOffset + " is more than " +
+ spoutConfig.maxOffsetBehind + " behind latest offset " + currentOffset + ", resetting to startOffsetTime=" + spoutConfig.startOffsetTime);
}
LOG.info("Starting Kafka " + _consumer.host() + ":" + id.partition + " from offset " + _committedTo);
[2/2] storm git commit: Update CHANGELOG and contributors for
STORM-685
Posted by da...@apache.org.
Update CHANGELOG and contributors for STORM-685
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0eb5f30e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0eb5f30e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0eb5f30e
Branch: refs/heads/master
Commit: 0eb5f30e95f29a02d88935850527ddb3bd23237b
Parents: fa429b2
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Feb 23 11:04:33 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Feb 23 11:07:56 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0eb5f30e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3614b44..1c34d8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
* STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: File '../stormconf.ser' does not exist.
* STORM-684: In RichSpoutBatchExecutor: underlying spout is not closed when emitter is closed
* STORM-683: Make false in a conf really evaluate to false in clojure.
+ * STORM-685: wrong output in log when committed offset is too far behind latest offset
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor
http://git-wip-us.apache.org/repos/asf/storm/blob/0eb5f30e/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index f9c997a..f9cb612 100644
--- a/README.markdown
+++ b/README.markdown
@@ -190,6 +190,7 @@ under the License.
* Paul DelRe ([@pdelre](https://github.com/pdelre))
* Zhihui Jiao ([@onlychoice](https://github.com/onlychoice))
* Hari Sekhon ([@harisekhon](https://github.com/harisekhon))
+* iBuddha ([@iBuddha](https://github.com/iBuddha))
## Acknowledgements