From c5ba0da99301c9ffc1216e23541cbe7d2cc9a102 Mon Sep 17 00:00:00 2001 From: wushujames Date: Thu, 8 Mar 2018 10:28:20 -0800 Subject: [PATCH] MINOR: Fix incorrect references to the max transaction timeout config (#4664) --- .../java/org/apache/kafka/clients/producer/ProducerConfig.java | 2 +- .../apache/kafka/common/errors/InvalidTxnTimeoutException.java | 2 +- .../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 aa3147b28b8..0c484dfae05 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 @@ -212,7 +212,7 @@ public class ProducerConfig extends AbstractConfig { /** transaction.timeout.ms */ 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."; /** transactional.id */ 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 c751bc4553d..f16af66da7c 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 941ce0b9e3d..5db1d314be3 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 @@ -474,7 +474,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) {