projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Verbesserte Tests und Korrekturen gemerged: stored-offsets -> stored-state
[demos/kafka/training]
/
src
/
main
/
java
/
de
/
juplo
/
kafka
/
ApplicationRebalanceListener.java
diff --git
a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
index
2fccb4f
..
247b6f7
100644
(file)
--- a/
src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/
src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@
-2,7
+2,6
@@
package de.juplo.kafka;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.common.TopicPartition;
import java.time.Clock;
import org.apache.kafka.common.TopicPartition;
import java.time.Clock;
@@
-19,10
+18,8
@@
public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
private final ApplicationRecordHandler recordHandler;
private final StateRepository stateRepository;
private final String id;
private final ApplicationRecordHandler recordHandler;
private final StateRepository stateRepository;
private final String id;
- private final String topic;
private final Clock clock;
private final Duration commitInterval;
private final Clock clock;
private final Duration commitInterval;
- private final Consumer<String, Long> consumer;
private Instant lastCommit = Instant.EPOCH;
private Instant lastCommit = Instant.EPOCH;
@@
-32,18
+29,11
@@
public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
partitions.forEach(tp ->
{
Integer partition = tp.partition();
partitions.forEach(tp ->
{
Integer partition = tp.partition();
- Long offset = consumer.position(tp);
- log.info("{} - adding partition: {}, offset={}", id, partition, offset);
+ log.info("{} - adding partition: {}", id, partition);
StateDocument document =
stateRepository
.findById(Integer.toString(partition))
.orElse(new StateDocument(partition));
StateDocument document =
stateRepository
.findById(Integer.toString(partition))
.orElse(new StateDocument(partition));
- if (document.offset >= 0)
- {
- // Only seek, if a stored offset was found
- // Otherwise: Use initial offset, generated by Kafka
- consumer.seek(tp, document.offset);
- }
recordHandler.addPartition(partition, document.state);
});
}
recordHandler.addPartition(partition, document.state);
});
}
@@
-54,14
+44,18
@@
public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
partitions.forEach(tp ->
{
Integer partition = tp.partition();
partitions.forEach(tp ->
{
Integer partition = tp.partition();
- Long newOffset = consumer.position(tp);
- log.info(
- "{} - removing partition: {}, offset of next message {})",
- id,
- partition,
- newOffset);
+ log.info("{} - removing partition: {}", id, partition);
Map<String, Long> removed = recordHandler.removePartition(partition);
Map<String, Long> removed = recordHandler.removePartition(partition);
- stateRepository.save(new StateDocument(partition, removed, consumer.position(tp)));
+ for (String key : removed.keySet())
+ {
+ log.info(
+ "{} - Seen {} messages for partition={}|key={}",
+ id,
+ removed.get(key),
+ partition,
+ key);
+ }
+ stateRepository.save(new StateDocument(partition, removed));
});
}
});
}
@@
-71,12
+65,11
@@
public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
{
if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
{
{
if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
{
- log.debug("Storing data
and offsets
, last commit: {}", lastCommit);
- recordHandler.getState().forEach((partiton, stat
e
) -> stateRepository.save(
+ log.debug("Storing data, last commit: {}", lastCommit);
+ recordHandler.getState().forEach((partiton, stat
istics
) -> stateRepository.save(
new StateDocument(
partiton,
new StateDocument(
partiton,
- state,
- consumer.position(new TopicPartition(topic, partiton)))));
+ statistics)));
lastCommit = clock.instant();
}
}
lastCommit = clock.instant();
}
}