GH-656: Fix seek on rollback [Backport] #659
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
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
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,49 @@ | ||
| /* | ||
| * Copyright 2018 the original author or authors. | ||
| * | ||
| * Licensed 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.springframework.kafka.listener; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.apache.kafka.clients.consumer.Consumer; | ||
| import org.apache.kafka.clients.consumer.ConsumerRecord; | ||
|
|
||
| /** | ||
| * Invoked by a listener container with remaining, unprocessed, records | ||
| * (including the failed record). Implementations should seek the desired | ||
| * topics/partitions so that records will be re-fetched on the next | ||
| * poll. When used with a batch listener, the entire batch of records is | ||
| * provided. | ||
| * | ||
| * @param <K> the key type. | ||
| * @param <V> the value type. | ||
| * | ||
| * @author Gary Russell | ||
| * | ||
| * @since 1.3.5 | ||
| * | ||
| */ | ||
| @FunctionalInterface | ||
| public interface AfterRollbackProcessor<K, V> { | ||
|
|
||
| /** | ||
| * Process the remaining records. | ||
| * @param records the records. | ||
| * @param consumer the consumer. | ||
| */ | ||
| void process(List<ConsumerRecord<K, V>> records, Consumer<K, V> consumer); | ||
|
|
||
| } | ||
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,69 @@ | ||
| /* | ||
| * Copyright 2018 the original author or authors. | ||
| * | ||
| * Licensed 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.springframework.kafka.listener; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
|
|
||
| import org.apache.commons.logging.Log; | ||
| import org.apache.commons.logging.LogFactory; | ||
| import org.apache.kafka.clients.consumer.Consumer; | ||
| import org.apache.kafka.clients.consumer.ConsumerRecord; | ||
| import org.apache.kafka.common.TopicPartition; | ||
|
|
||
| /** | ||
| * Default implementation of {@link AfterRollbackProcessor}. Seeks all | ||
| * topic/partitions so the records will be re-fetched, including the failed | ||
| * record. | ||
| * | ||
| * @param <K> the key type. | ||
| * @param <V> the value type. | ||
| * | ||
| * @author Gary Russell | ||
| * | ||
| * @since 1.3.5 | ||
| * | ||
| */ | ||
| public class DefaultAfterRollbackProcessor<K, V> implements AfterRollbackProcessor<K, V> { | ||
|
|
||
| private static final Log logger = LogFactory.getLog(DefaultAfterRollbackProcessor.class); | ||
|
|
||
| @Override | ||
| public void process(List<ConsumerRecord<K, V>> records, Consumer<K, V> consumer) { | ||
| Map<TopicPartition, Long> seekOffsets = new HashMap<>(); | ||
| Iterator<ConsumerRecord<K, V>> iterator = records.iterator(); | ||
| while (iterator.hasNext()) { | ||
| ConsumerRecord<K, V> record = iterator.next(); | ||
| TopicPartition topicPartition = new TopicPartition(record.topic(), record.partition()); | ||
| if (!seekOffsets.containsKey(topicPartition)) { | ||
| seekOffsets.put(topicPartition, record.offset()); | ||
| } | ||
| } | ||
| for (Entry<TopicPartition, Long> entry : seekOffsets.entrySet()) { | ||
|
There was a problem hiding this comment. Why do we need this extra loop if we can just perform There was a problem hiding this comment. It seems much more complicated to me to keep track of which ones we've already seeked. There was a problem hiding this comment. Well, I mean something like this: Set<TopicPartition> seekOffsets = new HashSet<>();
Iterator<ConsumerRecord<K, V>> iterator = records.iterator();
while (iterator.hasNext()) {
ConsumerRecord<K, V> record = iterator.next();
TopicPartition topicPartition = new TopicPartition(record.topic(), record.partition());
if (seekOffsets.add(topicPartition)) {
try {
consumer.seek(topicPartition, record.offset());
}
catch (Exception e) {
logger.error("Failed to seek " + entry.getKey() + " to " + entry.getValue());
}
}
}No? What am I missing? Thanks There was a problem hiding this comment. I don't see a big difference and I doubt the performance will be any better - it has to calculate hash codes instead performing the second loop - but feel free to change it if you insist. There was a problem hiding this comment.
??? Don't you do that already with the current There was a problem hiding this comment. Doh, of course; ok. Feel free to change it. |
||
| try { | ||
| consumer.seek(entry.getKey(), entry.getValue()); | ||
| } | ||
| catch (Exception e) { | ||
| logger.error("Failed to seek " + entry.getKey() + " to " + entry.getValue()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
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
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
Oops, something went wrong.
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.
This is not going to work on Java 7, I guess.
Or will be ignored at runtime...