kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gwens...@apache.org
Subject [kafka] branch trunk updated: MINOR: Fixed a couple of typos in Config docs
Date Wed, 13 Feb 2019 01:39:46 GMT
This is an automated email from the ASF dual-hosted git repository.

gwenshap pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 62b2249  MINOR: Fixed a couple of typos in Config docs
62b2249 is described below

commit 62b22496c22563c30eec4f84c0083e15d2abbdf0
Author: Mickael Maison <mickael.maison@gmail.com>
AuthorDate: Tue Feb 12 17:39:27 2019 -0800

    MINOR: Fixed a couple of typos in Config docs
    
    Author: Mickael Maison <mickael.maison@gmail.com>
    
    Reviewers: Gwen Shapira
    
    Closes #6259 from mimaison/config-typos
---
 .../main/java/org/apache/kafka/clients/producer/ProducerConfig.java   | 2 +-
 core/src/main/scala/kafka/server/KafkaConfig.scala                    | 4 ++--
 2 files changed, 3 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 c63477d..9324b9e 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
@@ -192,7 +192,7 @@ public class ProducerConfig extends AbstractConfig {
             + " Note that this retry is no different than if the client resent the record
upon receiving the error."
             + " Allowing retries without setting <code>" + MAX_IN_FLIGHT_REQUESTS_PER_CONNECTION
+ "</code> to 1 will potentially change the"
             + " ordering of records because if two batches are sent to a single partition,
and the first fails and is retried but the second"
-            + " succeeds, then the records in the second batch may appear first. Note additionall
that produce requests will be"
+            + " succeeds, then the records in the second batch may appear first. Note additionally
that produce requests will be"
             + " failed before the number of retries has been exhausted if the timeout configured
by"
             + " <code>" + DELIVERY_TIMEOUT_MS_CONFIG + "</code> expires first
before successful acknowledgement. Users should generally"
             + " prefer to leave this config unset and instead use <code>" + DELIVERY_TIMEOUT_MS_CONFIG
+ "</code> to control"
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala
index ef93fd9..a801360 100755
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -566,8 +566,8 @@ object KafkaConfig {
     "then controller will use \"broker1.example.com:9094\" with security protocol \"SSL\"
to connect to the broker.\n" +
     "If not explicitly configured, the default value will be null and there will be no dedicated
endpoints for controller connections."
 
-  val SocketSendBufferBytesDoc = "The SO_SNDBUF buffer of the socket sever sockets. If the
value is -1, the OS default will be used."
-  val SocketReceiveBufferBytesDoc = "The SO_RCVBUF buffer of the socket sever sockets. If
the value is -1, the OS default will be used."
+  val SocketSendBufferBytesDoc = "The SO_SNDBUF buffer of the socket server sockets. If the
value is -1, the OS default will be used."
+  val SocketReceiveBufferBytesDoc = "The SO_RCVBUF buffer of the socket server sockets. If
the value is -1, the OS default will be used."
   val SocketRequestMaxBytesDoc = "The maximum number of bytes in a socket request"
   val MaxConnectionsPerIpDoc = "The maximum number of connections we allow from each ip address.
This can be set to 0 if there are overrides " +
     "configured using " + MaxConnectionsPerIpOverridesProp + " property"


Mime
View raw message