You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2015/11/13 19:42:53 UTC
kafka git commit: KAFKA-2791; removed deprecated properties
Repository: kafka
Updated Branches:
refs/heads/trunk 397306cdf -> 4efe4ac6d
KAFKA-2791; removed deprecated properties
Removed support for BLOCK_ON_BUFFER_FULL_CONFIG (block.on.buffer.full)
Removed support for METADATA_FETCH_TIMEOUT_CONFIG
Removed support for TIMEOUT_CONFIG (aka timeout.ms)
Added support for MAX_BLOCK_MS_CONFIG
Added support for REQUEST_TIMEOUT_MS_CONFIG
Author: Ben Stopford <be...@gmail.com>
Reviewers: Jun Rao <ju...@gmail.com>
Closes #525 from benstopford/KAFKA-2791
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/4efe4ac6
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/4efe4ac6
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/4efe4ac6
Branch: refs/heads/trunk
Commit: 4efe4ac6d785c708ec623a6dca24ae34d4b29097
Parents: 397306c
Author: Ben Stopford <be...@gmail.com>
Authored: Fri Nov 13 10:42:50 2015 -0800
Committer: Jun Rao <ju...@gmail.com>
Committed: Fri Nov 13 10:42:50 2015 -0800
----------------------------------------------------------------------
core/src/main/scala/kafka/tools/ConsoleProducer.scala | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/4efe4ac6/core/src/main/scala/kafka/tools/ConsoleProducer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/tools/ConsoleProducer.scala b/core/src/main/scala/kafka/tools/ConsoleProducer.scala
index ff1bd70..979c1bd 100644
--- a/core/src/main/scala/kafka/tools/ConsoleProducer.scala
+++ b/core/src/main/scala/kafka/tools/ConsoleProducer.scala
@@ -112,13 +112,11 @@ object ConsoleProducer {
props.put(ProducerConfig.SEND_BUFFER_CONFIG, config.socketBuffer.toString)
props.put(ProducerConfig.RETRY_BACKOFF_MS_CONFIG, config.retryBackoffMs.toString)
props.put(ProducerConfig.METADATA_MAX_AGE_CONFIG, config.metadataExpiryMs.toString)
- props.put(ProducerConfig.METADATA_FETCH_TIMEOUT_CONFIG, config.metadataFetchTimeoutMs.toString)
+ props.put(ProducerConfig.MAX_BLOCK_MS_CONFIG, config.maxBlockMs.toString)
props.put(ProducerConfig.ACKS_CONFIG, config.requestRequiredAcks.toString)
- props.put(ProducerConfig.TIMEOUT_CONFIG, config.requestTimeoutMs.toString)
+ props.put(ProducerConfig.REQUEST_TIMEOUT_MS_CONFIG, config.requestTimeoutMs.toString)
props.put(ProducerConfig.RETRIES_CONFIG, config.messageSendMaxRetries.toString)
props.put(ProducerConfig.LINGER_MS_CONFIG, config.sendTimeout.toString)
- if(config.queueEnqueueTimeoutMs != -1)
- props.put(ProducerConfig.BLOCK_ON_BUFFER_FULL_CONFIG, "false")
props.put(ProducerConfig.BUFFER_MEMORY_CONFIG, config.maxMemoryBytes.toString)
props.put(ProducerConfig.BATCH_SIZE_CONFIG, config.maxPartitionMemoryBytes.toString)
props.put(ProducerConfig.CLIENT_ID_CONFIG, "console-producer")
@@ -190,10 +188,10 @@ object ConsoleProducer {
.describedAs("metadata expiration interval")
.ofType(classOf[java.lang.Long])
.defaultsTo(5*60*1000L)
- val metadataFetchTimeoutMsOpt = parser.accepts("metadata-fetch-timeout-ms",
- "The amount of time to block waiting to fetch metadata about a topic the first time a record is sent to that topic.")
+ val maxBlockMsOpt = parser.accepts("max-block-ms",
+ "The max time that the producer will block for during a send request")
.withRequiredArg
- .describedAs("metadata fetch timeout")
+ .describedAs("max block on send")
.ofType(classOf[java.lang.Long])
.defaultsTo(60*1000L)
val maxMemoryBytesOpt = parser.accepts("max-memory-bytes",
@@ -276,7 +274,7 @@ object ConsoleProducer {
val maxMemoryBytes = options.valueOf(maxMemoryBytesOpt)
val maxPartitionMemoryBytes = options.valueOf(maxPartitionMemoryBytesOpt)
val metadataExpiryMs = options.valueOf(metadataExpiryMsOpt)
- val metadataFetchTimeoutMs = options.valueOf(metadataFetchTimeoutMsOpt)
+ val maxBlockMs = options.valueOf(maxBlockMsOpt)
}
trait MessageReader {