Repository: kafka Updated Branches: refs/heads/trunk 8ef804dc1 -> 3f28d7744
KAFKA-3373; MINOR: follow-up, a few val renames remaining I also slightly tweaked the wording on a couple of warnings. Author: Ismael Juma <[email protected]> Reviewers: Gwen Shapira Closes #1072 from ijuma/kafka-3373-follow-up Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/3f28d774 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/3f28d774 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/3f28d774 Branch: refs/heads/trunk Commit: 3f28d77449bd3280f53edab81657e6c2a37f3c3e Parents: 8ef804d Author: Ismael Juma <[email protected]> Authored: Thu Mar 17 13:59:56 2016 -0700 Committer: Gwen Shapira <[email protected]> Committed: Thu Mar 17 13:59:56 2016 -0700 ---------------------------------------------------------------------- .../main/scala/kafka/admin/ConfigCommand.scala | 2 +- .../main/scala/kafka/admin/TopicCommand.scala | 2 +- core/src/main/scala/kafka/log/LogConfig.scala | 6 ++--- .../main/scala/kafka/server/KafkaConfig.scala | 24 ++++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/3f28d774/core/src/main/scala/kafka/admin/ConfigCommand.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/admin/ConfigCommand.scala b/core/src/main/scala/kafka/admin/ConfigCommand.scala index 276689a..614e3fe 100644 --- a/core/src/main/scala/kafka/admin/ConfigCommand.scala +++ b/core/src/main/scala/kafka/admin/ConfigCommand.scala @@ -119,7 +119,7 @@ object ConfigCommand { configsToBeAdded.foreach(pair => props.setProperty(pair(0).trim, pair(1).trim)) if (props.containsKey(LogConfig.MessageFormatVersionProp)) { println(s"WARNING: The configuration ${LogConfig.MessageFormatVersionProp}=${props.getProperty(LogConfig.MessageFormatVersionProp)} is specified. " + - s"This configuration will be ignored if the value is on a version newer than the specified inter.broker.protocol.version in the broker.") + s"This configuration will be ignored if the version is newer than the inter.broker.protocol.version specified in the broker.") } props } http://git-wip-us.apache.org/repos/asf/kafka/blob/3f28d774/core/src/main/scala/kafka/admin/TopicCommand.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/admin/TopicCommand.scala b/core/src/main/scala/kafka/admin/TopicCommand.scala index b3b0635..dd4ea88 100755 --- a/core/src/main/scala/kafka/admin/TopicCommand.scala +++ b/core/src/main/scala/kafka/admin/TopicCommand.scala @@ -239,7 +239,7 @@ object TopicCommand extends Logging { LogConfig.validate(props) if (props.containsKey(LogConfig.MessageFormatVersionProp)) { println(s"WARNING: The configuration ${LogConfig.MessageFormatVersionProp}=${props.getProperty(LogConfig.MessageFormatVersionProp)} is specified. " + - s"This configuration will be ignored if the value is on a version newer than the specified inter.broker.protocol.version in the broker.") + s"This configuration will be ignored if the version is newer than the inter.broker.protocol.version specified in the broker.") } props } http://git-wip-us.apache.org/repos/asf/kafka/blob/3f28d774/core/src/main/scala/kafka/log/LogConfig.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/log/LogConfig.scala b/core/src/main/scala/kafka/log/LogConfig.scala index ffec85a..698464e 100755 --- a/core/src/main/scala/kafka/log/LogConfig.scala +++ b/core/src/main/scala/kafka/log/LogConfig.scala @@ -137,9 +137,9 @@ object LogConfig { "standard compression codecs ('gzip', 'snappy', lz4). It additionally accepts 'uncompressed' which is equivalent to " + "no compression; and 'producer' which means retain the original compression codec set by the producer." val PreAllocateEnableDoc ="Should pre allocate file when create new segment?" - val MessageFormatVersionDoc = KafkaConfig.MessageFormatVersionDoc - val MessageTimestampTypeDoc = KafkaConfig.MessageTimestampTypeDoc - val MessageTimestampDifferenceMaxMsDoc = KafkaConfig.MessageTimestampDifferenceMaxMsDoc + val MessageFormatVersionDoc = KafkaConfig.LogMessageFormatVersionDoc + val MessageTimestampTypeDoc = KafkaConfig.LogMessageTimestampTypeDoc + val MessageTimestampDifferenceMaxMsDoc = KafkaConfig.LogMessageTimestampDifferenceMaxMsDoc private val configDef = { import org.apache.kafka.common.config.ConfigDef.Importance._ http://git-wip-us.apache.org/repos/asf/kafka/blob/3f28d774/core/src/main/scala/kafka/server/KafkaConfig.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala index 9c24876..7e1013e 100755 --- a/core/src/main/scala/kafka/server/KafkaConfig.scala +++ b/core/src/main/scala/kafka/server/KafkaConfig.scala @@ -428,18 +428,18 @@ object KafkaConfig { val LogFlushIntervalMsDoc = "The maximum time in ms that a message in any topic is kept in memory before flushed to disk. If not set, the value in " + LogFlushSchedulerIntervalMsProp + " is used" val LogFlushOffsetCheckpointIntervalMsDoc = "The frequency with which we update the persistent record of the last flush which acts as the log recovery point" val LogPreAllocateEnableDoc = "Should pre allocate file when create new segment? If you are using Kafka on Windows, you probably need to set it to true." + val LogMessageFormatVersionDoc = "Specify the message format version the broker will use to append messages to the logs. The value should be a valid ApiVersion. " + + "Some examples are: 0.8.2, 0.9.0.0, 0.10.0, check ApiVersion for more details. By setting a particular message format version, the " + + "user is certifying that all the existing messages on disk are smaller or equal than the specified version. Setting this value incorrectly " + + "will cause consumers with older versions to break as they will receive messages with a format that they don't understand." + val LogMessageTimestampTypeDoc = "Define whether the timestamp in the message is message create time or log append time. The value should be either " + + "`CreateTime` or `LogAppendTime`" + val LogMessageTimestampDifferenceMaxMsDoc = "The maximum difference allowed between the timestamp when a broker receives " + + "a message and the timestamp specified in the message. If message.timestamp.type=CreateTime, a message will be rejected " + + "if the difference in timestamp exceeds this threshold. This configuration is ignored if message.timestamp.type=LogAppendTime." val NumRecoveryThreadsPerDataDirDoc = "The number of threads per data directory to be used for log recovery at startup and flushing at shutdown" val AutoCreateTopicsEnableDoc = "Enable auto creation of topic on the server" val MinInSyncReplicasDoc = "define the minimum number of replicas in ISR needed to satisfy a produce request with acks=all (or -1)" - val MessageFormatVersionDoc = "Specify the message format version the broker will use to append messages to the logs. The value should be a valid ApiVersion. " + - "Some examples are: 0.8.2, 0.9.0.0, 0.10.0, check ApiVersion for more details. By setting a particular message format version, the " + - "user is certifying that all the existing messages on disk are smaller or equal than the specified version. Setting this value incorrectly " + - "will cause consumers with older versions to break as they will receive messages with a format that they don't understand." - val MessageTimestampTypeDoc = "Define whether the timestamp in the message is message create time or log append time. The value should be either " + - "`CreateTime` or `LogAppendTime`" - val MessageTimestampDifferenceMaxMsDoc = "The maximum difference allowed between the timestamp when a broker receives " + - "a message and the timestamp specified in the message. If message.timestamp.type=CreateTime, a message will be rejected " + - "if the difference in timestamp exceeds this threshold. This configuration is ignored if message.timestamp.type=LogAppendTime." /** ********* Replication configuration ***********/ val ControllerSocketTimeoutMsDoc = "The socket timeout for controller-to-broker channels" val ControllerMessageQueueSizeDoc = "The buffer size for controller-to-broker-channels" @@ -617,9 +617,9 @@ object KafkaConfig { .define(NumRecoveryThreadsPerDataDirProp, INT, Defaults.NumRecoveryThreadsPerDataDir, atLeast(1), HIGH, NumRecoveryThreadsPerDataDirDoc) .define(AutoCreateTopicsEnableProp, BOOLEAN, Defaults.AutoCreateTopicsEnable, HIGH, AutoCreateTopicsEnableDoc) .define(MinInSyncReplicasProp, INT, Defaults.MinInSyncReplicas, atLeast(1), HIGH, MinInSyncReplicasDoc) - .define(LogMessageFormatVersionProp, STRING, Defaults.LogMessageFormatVersion, MEDIUM, MessageFormatVersionDoc) - .define(LogMessageTimestampTypeProp, STRING, Defaults.LogMessageTimestampType, in("CreateTime", "LogAppendTime"), MEDIUM, MessageTimestampTypeDoc) - .define(LogMessageTimestampDifferenceMaxMsProp, LONG, Defaults.LogMessageTimestampDifferenceMaxMs, atLeast(0), MEDIUM, MessageTimestampDifferenceMaxMsDoc) + .define(LogMessageFormatVersionProp, STRING, Defaults.LogMessageFormatVersion, MEDIUM, LogMessageFormatVersionDoc) + .define(LogMessageTimestampTypeProp, STRING, Defaults.LogMessageTimestampType, in("CreateTime", "LogAppendTime"), MEDIUM, LogMessageTimestampTypeDoc) + .define(LogMessageTimestampDifferenceMaxMsProp, LONG, Defaults.LogMessageTimestampDifferenceMaxMs, atLeast(0), MEDIUM, LogMessageTimestampDifferenceMaxMsDoc) /** ********* Replication configuration ***********/ .define(ControllerSocketTimeoutMsProp, INT, Defaults.ControllerSocketTimeoutMs, MEDIUM, ControllerSocketTimeoutMsDoc)
