You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/01/25 00:29:32 UTC
[24/50] storm git commit: address review comments;
clarify 'cleanup()' behavior in distributed mode
address review comments; clarify 'cleanup()' behavior in distributed mode
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7241dc99
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7241dc99
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7241dc99
Branch: refs/heads/1.x-branch
Commit: 7241dc99fb9fe1ed759be305a0772e2d2be7f5f7
Parents: 0411ddd
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 20 12:34:38 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 20 12:34:38 2016 -0500
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/trident/Stream.java | 4 ++--
.../src/jvm/org/apache/storm/trident/operation/Operation.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7241dc99/storm-core/src/jvm/org/apache/storm/trident/Stream.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/trident/Stream.java b/storm-core/src/jvm/org/apache/storm/trident/Stream.java
index 50b3c59..fb2497a 100644
--- a/storm-core/src/jvm/org/apache/storm/trident/Stream.java
+++ b/storm-core/src/jvm/org/apache/storm/trident/Stream.java
@@ -59,14 +59,14 @@ import org.apache.storm.trident.util.TridentUtils;
/**
* A Stream represents the core data model in Trident, and can be thought of as a "stream" of tuples that are processed
- * as a series of small batches. A stream is partitioned accross the nodes in the in the cluster, and operations are
+ * as a series of small batches. A stream is partitioned accross the nodes in the cluster, and operations are
* applied to a stream in parallel accross each partition.
*
* There are five types of operations that can be performed on streams in Trident
*
* 1. **Partiton-Local Operations** - Operations that are applied locally to each partition and do not involve network
* transfer
- * 2. **Repartitioning Operations** - Operations that that change how tuples are partitioned across tasks(thus causing
+ * 2. **Repartitioning Operations** - Operations that change how tuples are partitioned across tasks(thus causing
* network transfer), but do not change the content of the stream.
* 3. **Aggregation Operations** - Operations that *may* repartition a stream (thus causing network transfer)
* 4. **Grouping Operations** - Operations that may repartition a stream on specific fields and group together tuples whose
http://git-wip-us.apache.org/repos/asf/storm/blob/7241dc99/storm-core/src/jvm/org/apache/storm/trident/operation/Operation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/trident/operation/Operation.java b/storm-core/src/jvm/org/apache/storm/trident/operation/Operation.java
index 3c87fe9..878a5c2 100644
--- a/storm-core/src/jvm/org/apache/storm/trident/operation/Operation.java
+++ b/storm-core/src/jvm/org/apache/storm/trident/operation/Operation.java
@@ -25,7 +25,8 @@ import java.util.Map;
*
* `Operation` defines two lifecycle methods for Trident components. The `prepare()` method is called once when the
* `Operation` is first initialized. The `cleanup()` method is called in local mode when the local cluster is
- * being shut down.
+ * being shut down. In distributed mode, the `cleanup()` method is not guaranteed to be called in every situation, but
+ * Storm will make a best effort call `cleanup()` whenever possible.
*/
public interface Operation extends Serializable {
/**