[kafka] branch trunk updated: KAFKA-12613: Fix inconsistent validation logic between KafkaConfig and LogConfig (#10472)

[mimaison]

This is an automated email from the ASF dual-hosted git repository.

mimaison 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 01e4ceba52 KAFKA-12613: Fix inconsistent validation logic between 
KafkaConfig and LogConfig (#10472)
01e4ceba52 is described below

commit 01e4ceba52b7e2a4046b595f21b233c65060192e
Author: Lee Dongjin <dong...@apache.org>
AuthorDate: Thu Apr 14 18:58:57 2022 +0900

    KAFKA-12613: Fix inconsistent validation logic between KafkaConfig and 
LogConfig (#10472)
    
    
    Reviewers: Mickael Maison <mickael.mai...@gmail.com>
---
 core/src/main/scala/kafka/log/LogConfig.scala      |  4 ++--
 core/src/main/scala/kafka/server/KafkaConfig.scala | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/scala/kafka/log/LogConfig.scala 
b/core/src/main/scala/kafka/log/LogConfig.scala
index 027e478825..6e3cf459c3 100755
--- a/core/src/main/scala/kafka/log/LogConfig.scala
+++ b/core/src/main/scala/kafka/log/LogConfig.scala
@@ -331,9 +331,9 @@ object LogConfig {
         KafkaConfig.LogRollTimeMillisProp)
       .define(SegmentJitterMsProp, LONG, Defaults.SegmentJitterMs, atLeast(0), 
MEDIUM, SegmentJitterMsDoc,
         KafkaConfig.LogRollTimeJitterMillisProp)
-      .define(SegmentIndexBytesProp, INT, Defaults.MaxIndexSize, atLeast(0), 
MEDIUM, MaxIndexSizeDoc,
+      .define(SegmentIndexBytesProp, INT, Defaults.MaxIndexSize, atLeast(4), 
MEDIUM, MaxIndexSizeDoc,
         KafkaConfig.LogIndexSizeMaxBytesProp)
-      .define(FlushMessagesProp, LONG, Defaults.FlushInterval, atLeast(0), 
MEDIUM, FlushIntervalDoc,
+      .define(FlushMessagesProp, LONG, Defaults.FlushInterval, atLeast(1), 
MEDIUM, FlushIntervalDoc,
         KafkaConfig.LogFlushIntervalMessagesProp)
       .define(FlushMsProp, LONG, Defaults.FlushMs, atLeast(0), MEDIUM, 
FlushMsDoc,
         KafkaConfig.LogFlushIntervalMsProp)
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala 
b/core/src/main/scala/kafka/server/KafkaConfig.scala
index 6fe0acaa9d..1dd1626139 100755
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -1185,11 +1185,11 @@ object KafkaConfig {
       .define(LogCleanerIoBufferSizeProp, INT, 
Defaults.LogCleanerIoBufferSize, atLeast(0), MEDIUM, LogCleanerIoBufferSizeDoc)
       .define(LogCleanerDedupeBufferLoadFactorProp, DOUBLE, 
Defaults.LogCleanerDedupeBufferLoadFactor, MEDIUM, 
LogCleanerDedupeBufferLoadFactorDoc)
       .define(LogCleanerBackoffMsProp, LONG, Defaults.LogCleanerBackoffMs, 
atLeast(0), MEDIUM, LogCleanerBackoffMsDoc)
-      .define(LogCleanerMinCleanRatioProp, DOUBLE, 
Defaults.LogCleanerMinCleanRatio, MEDIUM, LogCleanerMinCleanRatioDoc)
+      .define(LogCleanerMinCleanRatioProp, DOUBLE, 
Defaults.LogCleanerMinCleanRatio, between(0, 1), MEDIUM, 
LogCleanerMinCleanRatioDoc)
       .define(LogCleanerEnableProp, BOOLEAN, Defaults.LogCleanerEnable, 
MEDIUM, LogCleanerEnableDoc)
-      .define(LogCleanerDeleteRetentionMsProp, LONG, 
Defaults.LogCleanerDeleteRetentionMs, MEDIUM, LogCleanerDeleteRetentionMsDoc)
-      .define(LogCleanerMinCompactionLagMsProp, LONG, 
Defaults.LogCleanerMinCompactionLagMs, MEDIUM, LogCleanerMinCompactionLagMsDoc)
-      .define(LogCleanerMaxCompactionLagMsProp, LONG, 
Defaults.LogCleanerMaxCompactionLagMs, MEDIUM, LogCleanerMaxCompactionLagMsDoc)
+      .define(LogCleanerDeleteRetentionMsProp, LONG, 
Defaults.LogCleanerDeleteRetentionMs, atLeast(0), MEDIUM, 
LogCleanerDeleteRetentionMsDoc)
+      .define(LogCleanerMinCompactionLagMsProp, LONG, 
Defaults.LogCleanerMinCompactionLagMs, atLeast(0), MEDIUM, 
LogCleanerMinCompactionLagMsDoc)
+      .define(LogCleanerMaxCompactionLagMsProp, LONG, 
Defaults.LogCleanerMaxCompactionLagMs, atLeast(1), MEDIUM, 
LogCleanerMaxCompactionLagMsDoc)
       .define(LogIndexSizeMaxBytesProp, INT, Defaults.LogIndexSizeMaxBytes, 
atLeast(4), MEDIUM, LogIndexSizeMaxBytesDoc)
       .define(LogIndexIntervalBytesProp, INT, Defaults.LogIndexIntervalBytes, 
atLeast(0), MEDIUM, LogIndexIntervalBytesDoc)
       .define(LogFlushIntervalMessagesProp, LONG, 
Defaults.LogFlushIntervalMessages, atLeast(1), HIGH, 
LogFlushIntervalMessagesDoc)
@@ -1204,7 +1204,7 @@ object KafkaConfig {
       .define(MinInSyncReplicasProp, INT, Defaults.MinInSyncReplicas, 
atLeast(1), HIGH, MinInSyncReplicasDoc)
       .define(LogMessageFormatVersionProp, STRING, 
Defaults.LogMessageFormatVersion, ApiVersionValidator, MEDIUM, 
LogMessageFormatVersionDoc)
       .define(LogMessageTimestampTypeProp, STRING, 
Defaults.LogMessageTimestampType, in("CreateTime", "LogAppendTime"), MEDIUM, 
LogMessageTimestampTypeDoc)
-      .define(LogMessageTimestampDifferenceMaxMsProp, LONG, 
Defaults.LogMessageTimestampDifferenceMaxMs, MEDIUM, 
LogMessageTimestampDifferenceMaxMsDoc)
+      .define(LogMessageTimestampDifferenceMaxMsProp, LONG, 
Defaults.LogMessageTimestampDifferenceMaxMs,  atLeast(0), MEDIUM, 
LogMessageTimestampDifferenceMaxMsDoc)
       .define(CreateTopicPolicyClassNameProp, CLASS, null, LOW, 
CreateTopicPolicyClassNameDoc)
       .define(AlterConfigPolicyClassNameProp, CLASS, null, LOW, 
AlterConfigPolicyClassNameDoc)
       .define(LogMessageDownConversionEnableProp, BOOLEAN, 
Defaults.MessageDownConversionEnable, LOW, LogMessageDownConversionEnableDoc)