import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
import org.apache.kafka.common.TopicPartition;
import java.util.*;
@RequiredArgsConstructor
@Slf4j
-public class ApplicationRebalanceListener implements ConsumerRebalanceListener
+public class ApplicationRebalanceListener implements RebalanceListener
{
private final ApplicationRecordHandler recordHandler;
private final AdderResults adderResults;
private final StateRepository stateRepository;
private final String id;
- private final Consumer consumer;
private final Set<Integer> partitions = new HashSet<>();
stateRepository
.findById(Integer.toString(partition))
.orElse(new StateDocument(partition));
- recordHandler.addPartition(partition, document.state);
+ log.info(
+ "{} - Offset of next unseen message for partition {}: {}",
+ id,
+ partition,
+ document.offset);
+ recordHandler.addPartition(partition, document.state, document.offset);
for (String user : document.state.keySet())
{
log.info(
@Override
public void onPartitionsRevoked(Collection<TopicPartition> partitions)
{
- log.info("{} - Commiting offsets for all previously assigned partitions", id);
- try
- {
- consumer.commitSync();
- }
- catch (Exception e)
- {
- log.warn("{} - Could not commit offsets in onPartitionsRevoked():", id, e);
- }
-
partitions.forEach(tp ->
{
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())
+ ApplicationState state = recordHandler.removePartition(partition);
+ log.info(
+ "{} - offset of next unseen message for partition {} is {}",
+ id,
+ partition,
+ state.getOffset());
+ for (String user : state.getAdderState().keySet())
{
log.info(
"{} - Saved state for partition={}|user={}: {}",
id,
partition,
user,
- state.get(user));
+ state.getAdderState().get(user));
}
Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
- stateRepository.save(new StateDocument(partition, state, results));
+ stateRepository.save(
+ new StateDocument(
+ partition,
+ state.getAdderState(),
+ results,
+ state.getOffset()));
});
}
+
+ @Override
+ public void beforeNextPoll()
+ {
+ partitions
+ .stream()
+ .forEach(partition ->
+ {
+ log.info("{} - persisting state & offset for partition: {}", id, partition);
+ ApplicationState state = recordHandler.getState(partition);
+ log.info(
+ "{} - offset of next unseen message for partition {} is {}",
+ id,
+ partition,
+ state.getOffset());
+ for (String user : state.getAdderState().keySet())
+ {
+ log.info(
+ "{} - Saved state for partition={}|user={}: {}",
+ id,
+ partition,
+ user,
+ state.getAdderState().get(user));
+ }
+ Map<String, List<AdderResult>> results = adderResults.getState(partition);
+ stateRepository.save(
+ new StateDocument(
+ partition,
+ state.getAdderState(),
+ results,
+ state.getOffset()));
+ });
+ }
}