import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
import org.apache.kafka.common.TopicPartition;
+import org.springframework.kafka.listener.ConsumerAwareRebalanceListener;
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Collection;
-import java.util.Map;
+import java.util.*;
@RequiredArgsConstructor
@Slf4j
-public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
+public class ApplicationRebalanceListener implements ConsumerAwareRebalanceListener
{
private final ApplicationRecordHandler recordHandler;
+ private final AdderResults adderResults;
private final StateRepository stateRepository;
private final String id;
- private final Clock clock;
- private final Duration commitInterval;
- private Instant lastCommit = Instant.EPOCH;
+ private final Set<Integer> partitions = new HashSet<>();
@Override
public void onPartitionsAssigned(Collection<TopicPartition> partitions)
{
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));
recordHandler.addPartition(partition, document.state);
+ for (String user : document.state.keySet())
+ {
+ log.info(
+ "{} - Restored state for partition={}|user={}: {}",
+ id,
+ partition,
+ user,
+ document.state.get(user));
+ }
+ adderResults.addPartition(partition, document.results);
});
}
{
Integer partition = tp.partition();
log.info("{} - removing partition: {}", id, partition);
- Map<String, Long> removed = recordHandler.removePartition(partition);
- for (String key : removed.keySet())
+ this.partitions.remove(partition);
+ Map<String, AdderResult> state = recordHandler.removePartition(partition);
+ for (String user : state.keySet())
{
log.info(
- "{} - Seen {} messages for partition={}|key={}",
+ "{} - Saved state for partition={}|user={}: {}",
id,
- removed.get(key),
partition,
- key);
+ user,
+ state.get(user));
}
- stateRepository.save(new StateDocument(partition, removed));
+ Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
+ stateRepository.save(new StateDocument(partition, state, results));
});
}
-
-
- @Override
- public void beforeNextPoll()
- {
- if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
- {
- log.debug("Storing data, last commit: {}", lastCommit);
- recordHandler.getState().forEach((partiton, adder) -> stateRepository.save(
- new StateDocument(
- partiton,
- adder.getState())));
- lastCommit = clock.instant();
- }
- }
}