kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [kafka] branch 1.0 updated: MINOR: Fix incorrect references to the max transaction timeout config (#4664)
Date Thu, 08 Mar 2018 18:34:22 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/1.0 by this push:
     new 18c290c  MINOR: Fix incorrect references to the max transaction timeout config (#4664)
18c290c is described below

commit 18c290c7f31c7aeccb9c4b964c0c129fa8321afb
Author: wushujames <jylcheng@yahoo.com>
AuthorDate: Thu Mar 8 10:28:20 2018 -0800

    MINOR: Fix incorrect references to the max transaction timeout config (#4664)
---
 .../src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java | 2 +-
 .../java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java | 2 +-
 clients/src/main/java/org/apache/kafka/common/protocol/Errors.java      | 2 +-
 3 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 b8c59f0..dd47ad9 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
@@ -211,7 +211,7 @@ public class ProducerConfig extends AbstractConfig {
     /** <code> transaction.timeout.ms </code> */
     public static final String TRANSACTION_TIMEOUT_CONFIG = "transaction.timeout.ms";
     public static final String TRANSACTION_TIMEOUT_DOC = "The maximum amount of time in ms
that the transaction coordinator will wait for a transaction status update from the producer
before proactively aborting the ongoing transaction." +
-            "If this value is larger than the max.transaction.timeout.ms setting in the broker,
the request will fail with a `InvalidTransactionTimeout` error.";
+            "If this value is larger than the transaction.max.timeout.ms setting in the broker,
the request will fail with a `InvalidTransactionTimeout` error.";
 
     /** <code> transactional.id </code> */
     public static final String TRANSACTIONAL_ID_CONFIG = "transactional.id";
diff --git a/clients/src/main/java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java
b/clients/src/main/java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java
index c751bc4..f16af66 100644
--- a/clients/src/main/java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java
+++ b/clients/src/main/java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java
@@ -18,7 +18,7 @@ package org.apache.kafka.common.errors;
 
 /**
  * The transaction coordinator returns this error code if the timeout received via the InitProducerIdRequest
is larger than
- * the `max.transaction.timeout.ms` config value.
+ * the `transaction.max.timeout.ms` config value.
  */
 public class InvalidTxnTimeoutException extends ApiException {
     private static final long serialVersionUID = 1L;
diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
index d937054..7100344 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
@@ -463,7 +463,7 @@ public enum Errors {
             }
         }),
     INVALID_TRANSACTION_TIMEOUT(50, "The transaction timeout is larger than the maximum value
allowed by " +
-                "the broker (as configured by max.transaction.timeout.ms).",
+                "the broker (as configured by transaction.max.timeout.ms).",
         new ApiExceptionBuilder() {
             @Override
             public ApiException build(String message) {

-- 
To stop receiving notification emails like this one, please contact
jgus@apache.org.

Mime
View raw message