From b9b9e79020e753ca184370ca755334db09505e21 Mon Sep 17 00:00:00 2001
From: Damian Guy <damian.guy@gmail.com>
Date: Wed, 31 May 2017 15:55:09 +0100
Subject: [PATCH 1/2] update stream docs for kip-134

---
 docs/streams.html | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/docs/streams.html b/docs/streams.html
index fe0e84ee3b74c..c25b31d3a2377 100644
--- a/docs/streams.html
+++ b/docs/streams.html
@@ -17,7 +17,7 @@
 
 <script><!--#include virtual="js/templateData.js" --></script>
 
-<script id="streams-template" type="text/x-handlebars-template">
+<!--<script id="streams-template" type="text/x-handlebars-template">-->
     <h1>Streams</h1>
 
         <ol class="toc">
@@ -658,7 +658,7 @@ <h4><a id="streams_dsl_sink" href="#streams_dsl_sink">Write streams back to Kafk
 </pre>
         <br>
 
-        <h3><a id="streams_execute" href="#streams_execute">Application Configuration and Execution</a></h3>
+        <h3><a id="streams_configure_execute" href="#streams_configure_execute">Application Configuration and Execution</a></h3>
 
         <p>
         Besides defining the topology, developers will also need to configure their applications
@@ -687,6 +687,7 @@ <h3><a id="streams_execute" href="#streams_execute">Application Configuration an
 StreamsConfig config = new StreamsConfig(settings);
 </pre>
 
+        <h4><a id="streams_client_config" href="#streams_clients_config">Producer and Consumer Configuration</a></h4>
         <p>
         Apart from Kafka Streams' own configuration parameters you can also specify parameters for the Kafka consumers and producers that are used internally,
         depending on the needs of your application. Similar to the Streams settings you define any such consumer and/or producer settings via <code>StreamsConfig</code>.
@@ -714,6 +715,24 @@ <h3><a id="streams_execute" href="#streams_execute">Application Configuration an
 settings.put(StremasConfig.producerConfig(ProducerConfig.RECEIVE_BUFFER_CONFIG), 64 * 1024);
 </pre>
 
+        <h4><a id="streams_broker_config" href="#streams_broker_config">Broker Configuration</a></h4>
+        <p>
+            Introduced in 0.11.0 is a new broker config that is particularly relevant to Kafka Streams applications, <code>group.initial.rebalance.delay.ms</code>.
+            This config specifies the time, in milliseconds, that the <code>GroupCoordinator</code> will delay the initial consumer rebalance.
+            The rebalance will be further delayed by the value of <code>group.initial.rebalance.delay.ms<</code> as each new member joins the consumer group, up to a maximum of the value set by <code>max.poll.interval.ms</code>.
+            The net benefit is that this should reduce the overall startup time for Kafka Streams applications with more than one thread.
+            The default value for <code>group.initial.rebalance.delay.ms</code> is 3 seconds.
+        </p>
+        <p>
+            In practice this means that if you are starting up your Kafka Streams app from a cold start, then when the first member joins the group there will be at least a 3 second delay before it is assigned any tasks.
+            If any other members join the group within the initial 3 seconds, then there will be a further 3 second delay.
+            Once no new members have joined the group within the 3 second delay, or <code>max.poll.interval.ms</code> is reached, then the group rebalance can complete and all current members will be assigned tasks.
+            The benefit of this approach, particularly for Kafka Streams applications, is that we can now delay the assignment and re-assignment of potentially expensive tasks as new members join.
+            So we can avoid the situation where one instance is assigned all tasks, begins restoring/processing, only to shortly after be rebalanced, and then have to start again with half of the tasks and so on.
+        </p>
+
+
+        <h4><a id="streams_execute" href="streams_execute">Executing Your Kafka Streams Application</a></h4>
         <p>
         You can call Kafka Streams from anywhere in your application code.
         Very commonly though you would do so within the <code>main()</code> method of your application, or some variant thereof.
@@ -926,7 +945,7 @@ <h3><a id="streams_api_changes_0101" href="#streams_api_changes_0101">Streams AP
             <li> JoinWindows has no default size anymore: JoinWindows.of("name").within(1000) changes to JoinWindows.of(1000) </li>
         </ul>
 
-</script>
+<!--</script>-->
 
 <!--#include virtual="../includes/_header.htm" -->
 <!--#include virtual="../includes/_top.htm" -->

From 58045f2044d2cc54e64777e404a195d50fb78cc7 Mon Sep 17 00:00:00 2001
From: Damian Guy <damian.guy@gmail.com>
Date: Wed, 31 May 2017 18:09:10 +0100
Subject: [PATCH 2/2] fix typos etc

---
 docs/streams.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/streams.html b/docs/streams.html
index c25b31d3a2377..524f984ee68d6 100644
--- a/docs/streams.html
+++ b/docs/streams.html
@@ -17,7 +17,7 @@
 
 <script><!--#include virtual="js/templateData.js" --></script>
 
-<!--<script id="streams-template" type="text/x-handlebars-template">-->
+<script id="streams-template" type="text/x-handlebars-template">
     <h1>Streams</h1>
 
         <ol class="toc">
@@ -719,7 +719,7 @@ <h4><a id="streams_broker_config" href="#streams_broker_config">Broker Configura
         <p>
             Introduced in 0.11.0 is a new broker config that is particularly relevant to Kafka Streams applications, <code>group.initial.rebalance.delay.ms</code>.
             This config specifies the time, in milliseconds, that the <code>GroupCoordinator</code> will delay the initial consumer rebalance.
-            The rebalance will be further delayed by the value of <code>group.initial.rebalance.delay.ms<</code> as each new member joins the consumer group, up to a maximum of the value set by <code>max.poll.interval.ms</code>.
+            The rebalance will be further delayed by the value of <code>group.initial.rebalance.delay.ms</code> as each new member joins the consumer group, up to a maximum of the value set by <code>max.poll.interval.ms</code>.
             The net benefit is that this should reduce the overall startup time for Kafka Streams applications with more than one thread.
             The default value for <code>group.initial.rebalance.delay.ms</code> is 3 seconds.
         </p>
@@ -732,7 +732,7 @@ <h4><a id="streams_broker_config" href="#streams_broker_config">Broker Configura
         </p>
 
 
-        <h4><a id="streams_execute" href="streams_execute">Executing Your Kafka Streams Application</a></h4>
+        <h4><a id="streams_execute" href="#streams_execute">Executing Your Kafka Streams Application</a></h4>
         <p>
         You can call Kafka Streams from anywhere in your application code.
         Very commonly though you would do so within the <code>main()</code> method of your application, or some variant thereof.
@@ -945,7 +945,7 @@ <h3><a id="streams_api_changes_0101" href="#streams_api_changes_0101">Streams AP
             <li> JoinWindows has no default size anymore: JoinWindows.of("name").within(1000) changes to JoinWindows.of(1000) </li>
         </ul>
 
-<!--</script>-->
+</script>
 
 <!--#include virtual="../includes/_header.htm" -->
 <!--#include virtual="../includes/_top.htm" -->