import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.common.TopicPartition;
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
import java.util.*;
@RequiredArgsConstructor
@Slf4j
-public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
+public class ApplicationRebalanceListener implements CommittingConsumerRebalanceListener
{
private final ApplicationRecordHandler recordHandler;
private final AdderResults adderResults;
private final StateRepository stateRepository;
private final String id;
- private final String topic;
- private final Clock clock;
- private final Duration commitInterval;
- private final Consumer<String, String> consumer;
+ private final Consumer consumer;
private final Set<Integer> partitions = new HashSet<>();
- private Instant lastCommit = Instant.EPOCH;
private boolean commitsEnabled = true;
@Override
partitions.forEach(tp ->
{
Integer partition = tp.partition();
+ log.info("{} - adding partition: {}", id, partition);
this.partitions.add(partition);
StateDocument document =
stateRepository
.findById(Integer.toString(partition))
.orElse(new StateDocument(partition));
- log.info("{} - adding partition: {}, offset={}", id, partition, document.offset);
- if (document.offset >= 0)
+ recordHandler.addPartition(partition, document.state);
+ for (String user : document.state.keySet())
{
- // Only seek, if a stored offset was found
- // Otherwise: Use initial offset, generated by Kafka
- consumer.seek(tp, document.offset);
+ log.info(
+ "{} - Restored state for partition={}|user={}: {}",
+ id,
+ partition,
+ user,
+ document.state.get(user));
}
- recordHandler.addPartition(partition, document.state);
adderResults.addPartition(partition, document.results);
});
}
@Override
public void onPartitionsRevoked(Collection<TopicPartition> partitions)
{
- partitions.forEach(tp ->
+ if (commitsEnabled)
{
- Integer partition = tp.partition();
- this.partitions.remove(partition);
- Long offset = consumer.position(tp);
- log.info(
- "{} - removing partition: {}, offset of next message {})",
- id,
- partition,
- offset);
- if (commitsEnabled)
+ log.info("{} - Commiting offsets for all previously assigned partitions", id);
+ try
{
- Map<String, AdderResult> state = recordHandler.removePartition(partition);
- Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
- stateRepository.save(new StateDocument(partition, state, results, offset));
+ consumer.commitSync();
}
- else
+ catch (Exception e)
{
- log.info("Offset commits are disabled! Last commit: {}", lastCommit);
+ log.warn("{} - Could not commit offsets in onPartitionsRevoked():", id, e);
}
- });
- }
-
-
- @Override
- public void beforeNextPoll()
- {
- if (!commitsEnabled)
- {
- log.info("Offset commits are disabled! Last commit: {}", lastCommit);
- return;
}
- if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
+ partitions.forEach(tp ->
{
- log.debug("Storing data and offsets, last commit: {}", lastCommit);
- partitions.forEach(partition -> stateRepository.save(
- new StateDocument(
- partition,
- recordHandler.getState(partition).getState(),
- adderResults.getState(partition),
- consumer.position(new TopicPartition(topic, partition)))));
- lastCommit = clock.instant();
- }
+ Integer partition = tp.partition();
+ log.info("{} - removing partition: {}", id, partition);
+ this.partitions.remove(partition);
+ Map<String, AdderResult> state = recordHandler.removePartition(partition);
+ for (String user : state.keySet())
+ {
+ log.info(
+ "{} - Saved state for partition={}|user={}: {}",
+ id,
+ partition,
+ user,
+ state.get(user));
+ }
+ Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
+ stateRepository.save(new StateDocument(partition, state, results));
+ });
}
@Override