From bec755ffc4e4b779a6c6d45b144a7e3a87dc64d7 Mon Sep 17 00:00:00 2001
From: Dustin Cote <dustin@confluent.io>
Date: Mon, 29 Aug 2016 08:44:37 -0400
Subject: [PATCH 1/4] change console producer default acks to 1, update acks
 docs

---
 .../org/apache/kafka/clients/producer/ProducerConfig.java    | 5 +++--
 core/src/main/scala/kafka/tools/ConsoleProducer.scala        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
index 2ca21832de6c..d54332f9ba5f 100644
--- a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
+++ b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
@@ -79,14 +79,15 @@ public class ProducerConfig extends AbstractConfig {
                                            + " durability of records that are sent. The following settings are allowed: "
                                            + " <ul>"
                                            + " <li><code>acks=0</code> If set to zero then the producer will not wait for any acknowledgment from the"
-                                           + " server at all. The record will be immediately added to the socket buffer and considered sent. No guarantee can be"
+                                           + " server at all. The record will be immediately added to the socket buffer and considered sent. There is no guarantee"
+                                           + " that the socket buffer will be flushed prior to the shutdown of the producer JVM.  No guarantee can be"
                                            + " made that the server has received the record in this case, and the <code>retries</code> configuration will not"
                                            + " take effect (as the client won't generally know of any failures). The offset given back for each record will"
                                            + " always be set to -1."
                                            + " <li><code>acks=1</code> This will mean the leader will write the record to its local log but will respond"
                                            + " without awaiting full acknowledgement from all followers. In this case should the leader fail immediately after"
                                            + " acknowledging the record but before the followers have replicated it then the record will be lost."
-                                           + " <li><code>acks=all</code> This means the leader will wait for the full set of in-sync replicas to"
+                                           + " <li><code>acks=[-1|all]</code> This means the leader will wait for the full set of in-sync replicas to"
                                            + " acknowledge the record. This guarantees that the record will not be lost as long as at least one in-sync replica"
                                            + " remains alive. This is the strongest available guarantee.";
 
diff --git a/core/src/main/scala/kafka/tools/ConsoleProducer.scala b/core/src/main/scala/kafka/tools/ConsoleProducer.scala
index a4cc3f1832ae..c536359c2a85 100644
--- a/core/src/main/scala/kafka/tools/ConsoleProducer.scala
+++ b/core/src/main/scala/kafka/tools/ConsoleProducer.scala
@@ -179,7 +179,7 @@ object ConsoleProducer {
       .withRequiredArg
       .describedAs("request required acks")
       .ofType(classOf[java.lang.String])
-      .defaultsTo("0")
+      .defaultsTo("1")
     val requestTimeoutMsOpt = parser.accepts("request-timeout-ms", "The ack timeout of the producer requests. Value must be non-negative and non-zero")
       .withRequiredArg
       .describedAs("request timeout ms")

From 12d7b850fd0c2e074b041492f8b1d46b0c587bf3 Mon Sep 17 00:00:00 2001
From: Dustin Cote <dustin@confluent.io>
Date: Wed, 7 Sep 2016 09:31:59 -0400
Subject: [PATCH 2/4] don't encourage acks=-1 (we want acks=all to be used)

---
 .../org/apache/kafka/clients/producer/ProducerConfig.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
index d54332f9ba5f..e6bf42f58563 100644
--- a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
+++ b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
@@ -87,9 +87,9 @@ public class ProducerConfig extends AbstractConfig {
                                            + " <li><code>acks=1</code> This will mean the leader will write the record to its local log but will respond"
                                            + " without awaiting full acknowledgement from all followers. In this case should the leader fail immediately after"
                                            + " acknowledging the record but before the followers have replicated it then the record will be lost."
-                                           + " <li><code>acks=[-1|all]</code> This means the leader will wait for the full set of in-sync replicas to"
+                                           + " <li><code>acks=all</code> This means the leader will wait for the full set of in-sync replicas to"
                                            + " acknowledge the record. This guarantees that the record will not be lost as long as at least one in-sync replica"
-                                           + " remains alive. This is the strongest available guarantee.";
+                                           + " remains alive. This is the strongest available guarantee. This is equivalent to the acks=-1 setting.";
 
     /** <code>timeout.ms</code> */
 

From 36512873de109b31c473c92655dc8effef7e7ad9 Mon Sep 17 00:00:00 2001
From: Dustin Cote <dustin@confluent.io>
Date: Wed, 7 Sep 2016 10:16:31 -0400
Subject: [PATCH 3/4] rollback acks=0 doc change

---
 .../java/org/apache/kafka/clients/producer/ProducerConfig.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
index e6bf42f58563..d9c8778a1d1a 100644
--- a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
+++ b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
@@ -79,8 +79,7 @@ public class ProducerConfig extends AbstractConfig {
                                            + " durability of records that are sent. The following settings are allowed: "
                                            + " <ul>"
                                            + " <li><code>acks=0</code> If set to zero then the producer will not wait for any acknowledgment from the"
-                                           + " server at all. The record will be immediately added to the socket buffer and considered sent. There is no guarantee"
-                                           + " that the socket buffer will be flushed prior to the shutdown of the producer JVM.  No guarantee can be"
+                                           + " server at all. The record will be immediately added to the socket buffer and considered sent.  No guarantee can be"
                                            + " made that the server has received the record in this case, and the <code>retries</code> configuration will not"
                                            + " take effect (as the client won't generally know of any failures). The offset given back for each record will"
                                            + " always be set to -1."

From 644d68e5fb5edffe0b60a0f53d56e3ab07fa234d Mon Sep 17 00:00:00 2001
From: Dustin Cote <dustin@confluent.io>
Date: Wed, 7 Sep 2016 10:17:18 -0400
Subject: [PATCH 4/4] Remove extra space

---
 .../java/org/apache/kafka/clients/producer/ProducerConfig.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
index d9c8778a1d1a..927229d04593 100644
--- a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
+++ b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
@@ -79,7 +79,7 @@ public class ProducerConfig extends AbstractConfig {
                                            + " durability of records that are sent. The following settings are allowed: "
                                            + " <ul>"
                                            + " <li><code>acks=0</code> If set to zero then the producer will not wait for any acknowledgment from the"
-                                           + " server at all. The record will be immediately added to the socket buffer and considered sent.  No guarantee can be"
+                                           + " server at all. The record will be immediately added to the socket buffer and considered sent. No guarantee can be"
                                            + " made that the server has received the record in this case, and the <code>retries</code> configuration will not"
                                            + " take effect (as the client won't generally know of any failures). The offset given back for each record will"
                                            + " always be set to -1."