You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by gw...@apache.org on 2016/07/29 22:54:06 UTC

kafka git commit: KAFKA-3946: Protocol guide should say that Produce request acks can o…

Repository: kafka
Updated Branches:
  refs/heads/trunk 38c65a9a3 -> 31264f697


KAFKA-3946: Protocol guide should say that Produce request acks can o\u2026

\u2026nly be 0, 1, or -1

Rephrased the documentation string for the Produce request
Updated the acks configuration docs to state that -1, 0, and 1 are the only allowed values

Author: Mickael Maison <mi...@gmail.com>

Reviewers: Gwen Shapira

Closes #1680 from mimaison/KAFKA-3946


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/31264f69
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/31264f69
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/31264f69

Branch: refs/heads/trunk
Commit: 31264f69796b5b2f803bb6daeac7ecd76acd6f99
Parents: 38c65a9
Author: Mickael Maison <mi...@gmail.com>
Authored: Fri Jul 29 15:53:58 2016 -0700
Committer: Gwen Shapira <cs...@gmail.com>
Committed: Fri Jul 29 15:53:58 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/kafka/clients/producer/ProducerConfig.java     | 2 +-
 .../src/main/java/org/apache/kafka/common/protocol/Protocol.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/31264f69/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
----------------------------------------------------------------------
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 8685dbd..3293aab 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
@@ -75,7 +75,7 @@ public class ProducerConfig extends AbstractConfig {
     /** <code>acks</code> */
     public static final String ACKS_CONFIG = "acks";
     private static final String ACKS_DOC = "The number of acknowledgments the producer requires the leader to have received before considering a request complete. This controls the "
-                                           + " durability of records that are sent. The following settings are common: "
+                                           + " 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"

http://git-wip-us.apache.org/repos/asf/kafka/blob/31264f69/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
----------------------------------------------------------------------
diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java b/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
index 2610e04..907f7ff 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
@@ -127,7 +127,7 @@ public class Protocol {
 
     public static final Schema PRODUCE_REQUEST_V0 = new Schema(new Field("acks",
                                                                    INT16,
-                                                                   "The number of nodes that should replicate the produce before returning. -1 indicates the full ISR."),
+                                                                   "The number of acknowledgments the producer requires the leader to have received before considering a request complete. Allowed values: 0 for no acknowledgments, 1 for only the leader and -1 for the full ISR."),
                                                                new Field("timeout", INT32, "The time to await a response in ms."),
                                                                new Field("topic_data", new ArrayOf(TOPIC_PRODUCE_DATA_V0)));