root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

KAFKA-9700: Fix negative estimatedCompressionRatio (#8285) 

There are cases where `currentEstimation` is less than
`COMPRESSION_RATIO_IMPROVING_STEP` causing
`estimatedCompressionRatio` to be negative. This, in turn,
may result in `MESSAGE_TOO_LARGE`.

Reviewers: Ismael Juma <ismael@juma.me.uk>
This commit is contained in:
jiameixie 2020-03-25 11:48:50 +08:00 committed by GitHub
parent b8e508c823
commit b5409b9c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/src/main/java/org/apache/kafka/common/record/CompressionRatioEstimator.java
View File

@ -46,7 +46,7 @@ public class CompressionRatioEstimator {
if (observedRatio > currentEstimation)
compressionRatioForTopic[type.id] = Math.max(currentEstimation + COMPRESSION_RATIO_DETERIORATE_STEP, observedRatio);
else if (observedRatio < currentEstimation) {
compressionRatioForTopic[type.id] = currentEstimation - COMPRESSION_RATIO_IMPROVING_STEP;
compressionRatioForTopic[type.id] = Math.max(currentEstimation - COMPRESSION_RATIO_IMPROVING_STEP, observedRatio);
}
}
return compressionRatioForTopic[type.id];
@ -108,4 +108,4 @@ public class CompressionRatioEstimator {
}
return compressionRatio;
}
}
}

53
clients/src/test/java/org/apache/kafka/common/record/CompressionRatioEstimatorTest.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.common.record;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.List;
public class CompressionRatioEstimatorTest {
@Test
public void testUpdateEstimation() {
class EstimationsObservedRatios {
float currentEstimation;
float observedRatio;
EstimationsObservedRatios(float currentEstimation, float observedRatio) {
this.currentEstimation = currentEstimation;
this.observedRatio = observedRatio;
}
}
// If currentEstimation is smaller than observedRatio, the updatedCompressionRatio is currentEstimation plus
// COMPRESSION_RATIO_DETERIORATE_STEP 0.05, otherwise currentEstimation minus COMPRESSION_RATIO_IMPROVING_STEP
// 0.005. There are four cases,and updatedCompressionRatio shouldn't smaller than observedRatio in all of cases.
// Refer to non test code for more details.
List<EstimationsObservedRatios> estimationsObservedRatios = Arrays.asList(
new EstimationsObservedRatios(0.8f, 0.84f),
new EstimationsObservedRatios(0.6f, 0.7f),
new EstimationsObservedRatios(0.6f, 0.4f),
new EstimationsObservedRatios(0.004f, 0.001f));
for (EstimationsObservedRatios estimationsObservedRatio : estimationsObservedRatios) {
String topic = "tp";
CompressionRatioEstimator.setEstimation(topic, CompressionType.ZSTD, estimationsObservedRatio.currentEstimation);
float updatedCompressionRatio = CompressionRatioEstimator.updateEstimation(topic, CompressionType.ZSTD, estimationsObservedRatio.observedRatio);
assertTrue(updatedCompressionRatio >= estimationsObservedRatio.observedRatio);
}
}
}