-
Notifications
You must be signed in to change notification settings - Fork 15.1k
KAFKA-9492; Ignore record errors in ProduceResponse for older versions #8030
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
rajinisivaram
merged 2 commits into
apache:trunk
from
rajinisivaram:KAFKA-9492-produce-npe
Feb 4, 2020
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
clients/src/test/java/org/apache/kafka/common/requests/ProduceResponseTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* | ||
| * 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.requests; | ||
|
|
||
| import org.apache.kafka.common.TopicPartition; | ||
| import org.apache.kafka.common.protocol.ApiKeys; | ||
| import org.apache.kafka.common.protocol.Errors; | ||
| import org.apache.kafka.common.protocol.types.Struct; | ||
| import org.apache.kafka.common.record.RecordBatch; | ||
| import org.junit.Test; | ||
|
|
||
| import java.nio.ByteBuffer; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import static org.apache.kafka.common.protocol.ApiKeys.PRODUCE; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| public class ProduceResponseTest { | ||
|
|
||
| @Test | ||
| public void produceResponseV5Test() { | ||
| Map<TopicPartition, ProduceResponse.PartitionResponse> responseData = new HashMap<>(); | ||
| TopicPartition tp0 = new TopicPartition("test", 0); | ||
| responseData.put(tp0, new ProduceResponse.PartitionResponse(Errors.NONE, | ||
| 10000, RecordBatch.NO_TIMESTAMP, 100)); | ||
|
|
||
| ProduceResponse v5Response = new ProduceResponse(responseData, 10); | ||
| short version = 5; | ||
|
|
||
| ByteBuffer buffer = v5Response.serialize(ApiKeys.PRODUCE, version, 0); | ||
| buffer.rewind(); | ||
|
|
||
| ResponseHeader.parse(buffer, ApiKeys.PRODUCE.responseHeaderVersion(version)); // throw away. | ||
|
|
||
| Struct deserializedStruct = ApiKeys.PRODUCE.parseResponse(version, buffer); | ||
|
|
||
| ProduceResponse v5FromBytes = (ProduceResponse) AbstractResponse.parseResponse(ApiKeys.PRODUCE, | ||
| deserializedStruct, version); | ||
|
|
||
| assertEquals(1, v5FromBytes.responses().size()); | ||
| assertTrue(v5FromBytes.responses().containsKey(tp0)); | ||
| ProduceResponse.PartitionResponse partitionResponse = v5FromBytes.responses().get(tp0); | ||
| assertEquals(100, partitionResponse.logStartOffset); | ||
| assertEquals(10000, partitionResponse.baseOffset); | ||
| assertEquals(10, v5FromBytes.throttleTimeMs()); | ||
| assertEquals(responseData, v5Response.responses()); | ||
| } | ||
|
|
||
| @Test | ||
| public void produceResponseVersionTest() { | ||
| Map<TopicPartition, ProduceResponse.PartitionResponse> responseData = new HashMap<>(); | ||
| responseData.put(new TopicPartition("test", 0), new ProduceResponse.PartitionResponse(Errors.NONE, | ||
| 10000, RecordBatch.NO_TIMESTAMP, 100)); | ||
| ProduceResponse v0Response = new ProduceResponse(responseData); | ||
| ProduceResponse v1Response = new ProduceResponse(responseData, 10); | ||
| ProduceResponse v2Response = new ProduceResponse(responseData, 10); | ||
| assertEquals("Throttle time must be zero", 0, v0Response.throttleTimeMs()); | ||
| assertEquals("Throttle time must be 10", 10, v1Response.throttleTimeMs()); | ||
| assertEquals("Throttle time must be 10", 10, v2Response.throttleTimeMs()); | ||
| assertEquals("Should use schema version 0", ApiKeys.PRODUCE.responseSchema((short) 0), | ||
| v0Response.toStruct((short) 0).schema()); | ||
| assertEquals("Should use schema version 1", ApiKeys.PRODUCE.responseSchema((short) 1), | ||
| v1Response.toStruct((short) 1).schema()); | ||
| assertEquals("Should use schema version 2", ApiKeys.PRODUCE.responseSchema((short) 2), | ||
| v2Response.toStruct((short) 2).schema()); | ||
| assertEquals("Response data does not match", responseData, v0Response.responses()); | ||
| assertEquals("Response data does not match", responseData, v1Response.responses()); | ||
| assertEquals("Response data does not match", responseData, v2Response.responses()); | ||
| } | ||
|
|
||
| @Test | ||
| public void produceResponseRecordErrorsTest() { | ||
| Map<TopicPartition, ProduceResponse.PartitionResponse> responseData = new HashMap<>(); | ||
| TopicPartition tp = new TopicPartition("test", 0); | ||
| ProduceResponse.PartitionResponse partResponse = new ProduceResponse.PartitionResponse(Errors.NONE, | ||
| 10000, RecordBatch.NO_TIMESTAMP, 100, | ||
| Collections.singletonList(new ProduceResponse.RecordError(3, "Record error")), | ||
| "Produce failed"); | ||
| responseData.put(tp, partResponse); | ||
|
|
||
| for (short ver = 0; ver <= PRODUCE.latestVersion(); ver++) { | ||
| ProduceResponse response = new ProduceResponse(responseData); | ||
| Struct struct = response.toStruct(ver); | ||
| assertEquals("Should use schema version " + ver, ApiKeys.PRODUCE.responseSchema(ver), struct.schema()); | ||
| ProduceResponse.PartitionResponse deserialized = new ProduceResponse(struct).responses().get(tp); | ||
| if (ver >= 8) { | ||
| assertEquals(1, deserialized.recordErrors.size()); | ||
| assertEquals(3, deserialized.recordErrors.get(0).batchIndex); | ||
| assertEquals("Record error", deserialized.recordErrors.get(0).message); | ||
| assertEquals("Produce failed", deserialized.errorMessage); | ||
| } else { | ||
| assertEquals(0, deserialized.recordErrors.size()); | ||
| assertEquals(null, deserialized.errorMessage); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we convert the type of LOG_APPEND_TIME_KEY_NAME from long to Field.Int64? the benefit of using Field.Int64 is shown below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chia7712 Thanks for the review. As @hachikuji mentioned, we can convert to use the generated classes, so will leave that for a separate PR.