X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=8e8464fbb09237f56257a69922c90c39f8abe09f;hb=348477f6e4ff77e78bf7b6db66e4716663c9512d;hp=cd9da64538cf0097d669fc26606120f72aba4d90;hpb=15d1ea617b16eb4e28d307615b572dff11f44a3a;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
index cd9da64..8e8464f 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -13,7 +13,7 @@ import java.util.*;
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
+public class ApplicationRebalanceListener implements RebalanceListener
 {
   private final ApplicationRecordHandler recordHandler;
   private final AdderResults adderResults;
@@ -22,7 +22,7 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   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<>();
 
@@ -35,19 +35,33 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
     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)
       {
         // Only seek, if a stored offset was found
         // Otherwise: Use initial offset, generated by Kafka
         consumer.seek(tp, document.offset);
+        log.info(
+            "{} - Seeking to offset {} for partition {}",
+            id,
+            document.offset,
+            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);
     });
   }
@@ -58,22 +72,32 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
     partitions.forEach(tp ->
     {
       Integer partition = tp.partition();
+      log.info("{} - removing partition: {}", id, 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(
+            "{} - Storing {} as offset of next message for partition {}",
+            id,
+            offset,
+            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, offset));
       }
       else
       {
-        log.info("Offset commits are disabled! Last commit: {}", lastCommit);
+        log.info("{} - Offset commits are disabled! Last commit: {}", id, lastCommit);
       }
     });
   }
@@ -84,13 +108,13 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   {
     if (!commitsEnabled)
     {
-      log.info("Offset commits are disabled! Last commit: {}", lastCommit);
+      log.info("{} - Offset commits are disabled! Last commit: {}", id, lastCommit);
       return;
     }
 
     if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
     {
-      log.debug("Storing data and offsets, last commit: {}", lastCommit);
+      log.debug("{} - Storing data and offsets, last commit: {}", id, lastCommit);
       partitions.forEach(partition -> stateRepository.save(
           new StateDocument(
               partition,