Repository: kafka Updated Branches: refs/heads/trunk 59779aa15 -> 670980ef2
KAFKA-4800: Streams State transition ASCII diagrams need fixing and polishing added \<pre> tags to not break javadoc display of the ASCII diagrams. see broken ascii here: https://kafka.apache.org/0102/javadoc/org/apache/kafka/streams/KafkaStreams.State.html fix can be checked with gradle :streams:javadoc and then checking streams/build/docs/javadoc/org/apache/kafka/streams/KafkaStreams.State.html I also fixed the diagram in StreamThread.java however currently no javadoc is generated for that one (since it's internal) enothereska please have a look Author: Clemens Valiente <[email protected]> Reviewers: Eno Thereska, Matthias J. Sax, Guozhang Wang Closes #2621 from cvaliente/KAFKA-4800-ASCII-diagrams Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/670980ef Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/670980ef Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/670980ef Branch: refs/heads/trunk Commit: 670980ef29fb70838dcd462d11789c2519981164 Parents: 59779aa Author: Clemens Valiente <[email protected]> Authored: Thu Mar 2 13:26:30 2017 -0800 Committer: Guozhang Wang <[email protected]> Committed: Thu Mar 2 13:26:30 2017 -0800 ---------------------------------------------------------------------- .../org/apache/kafka/streams/KafkaStreams.java | 42 ++++++++------- .../processor/internals/StreamThread.java | 55 ++++++++++---------- 2 files changed, 50 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/670980ef/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java ---------------------------------------------------------------------- diff --git a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java index 0cdeb73..2810ff8 100644 --- a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java +++ b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java @@ -142,30 +142,32 @@ public class KafkaStreams { * Note this instance will be in "Rebalancing" state if any of its threads is rebalancing * The expected state transition with the following defined states is: * - * +-----------+ - * +<------|Created | - * | +-----+-----+ - * | | +--+ - * | v | | - * | +-----+---v--+--+ - * +<----- | Rebalancing |<--------+ - * | +-----+---------+ ^ - * | +--+ | - * | | | | - * | +-----+---v--+-----+ | - * +------>|Running |------+ - * | +-----+------------+ + * <pre> + * +--------------+ + * +<----- | Created | + * | +-----+--------+ * | | * | v - * | +-------+--------+ - * +---->|Pending | - * |Shutdown | - * +-------+--------+ + * | +-----+--------+ + * +<----- | Rebalancing | <----+ + * | +--------------+ | + * | | + * | | + * | +--------------+ | + * +-----> | Running | ---->+ + * | +-----+--------+ + * | | + * | v + * | +-----+--------+ + * +-----> | Pending | + * | Shutdown | + * +-----+--------+ * | * v - * +-----+-----+ - * |Not Running| - * +-----------+ + * +-----+--------+ + * | Not Running | + * +--------------+ + * </pre> */ public enum State { CREATED(1, 2, 3), RUNNING(2, 3), REBALANCING(1, 2, 3), PENDING_SHUTDOWN(4), NOT_RUNNING; http://git-wip-us.apache.org/repos/asf/kafka/blob/670980ef/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java ---------------------------------------------------------------------- diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java index 033dc73..d447824 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java @@ -74,33 +74,34 @@ public class StreamThread extends Thread { * A thread must only be in one state at a time * The expected state transitions with the following defined states is: * - * +-----------+ - * |Not Running|<---------------+ - * +-----+-----+ | - * | | - * v | - * +-----+-----+ | - * +-----| Running |<------------+ | - * | +-----+-----+ | | - * | | | | - * | v | | - * | +-----+------------+ | | - * <---- |Partitions | | | - * | |Revoked | | | - * | +-----+------------+ | | - * | | | | - * | v | | - * | +-----+------------+ | | - * | |Assigning | | | - * | |Partitions |------+ | - * | +-----+------------+ | - * | | | - * | | | - * | +------v---------+ | - * +--->|Pending |------------+ - * |Shutdown | - * +-----+----------+ - * + * <pre> + * +-------------+ + * | Not Running | <-------+ + * +-----+-------+ | + * | | + * v | + * +-----+-------+ | + * +<--- | Running | <----+ | + * | +-----+-------+ | | + * | | | | + * | v | | + * | +-----+-------+ | | + * +<--- | Partitions | | | + * | | Revoked | | | + * | +-----+-------+ | | + * | | | | + * | v | | + * | +-----+-------+ | | + * | | Assigning | | | + * | | Partitions | ---->+ | + * | +-----+-------+ | + * | | | + * | v | + * | +-----+-------+ | + * +---> | Pending | ------->+ + * | Shutdown | + * +-------------+ + * </pre> */ public enum State { NOT_RUNNING(1), RUNNING(1, 2, 4), PARTITIONS_REVOKED(3, 4), ASSIGNING_PARTITIONS(1, 4), PENDING_SHUTDOWN(0);
