X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=eef0d00d73e07f8eda6053d3334498f439e6f7d7;hb=5805651c16e07a0710b88c2822894941f67c313e;hp=6776c0d6218c24f59e14ba356c52927014261730;hpb=14ddf90be0adbeb8ab34b516b9b158071ae491e4;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 6776c0d..eef0d00 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -2,29 +2,25 @@ package de.juplo.kafka;
 
 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.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.*;
 
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
+public class ApplicationRebalanceListener implements ConsumerRebalanceListener
 {
   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 final Consumer consumer;
 
   private final Set<Integer> partitions = new HashSet<>();
 
-  private Instant lastCommit = Instant.EPOCH;
-
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
   {
@@ -38,6 +34,15 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
               .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);
     });
   }
@@ -45,6 +50,16 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   @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();
@@ -54,7 +69,7 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
       for (String user : state.keySet())
       {
         log.info(
-            "{} - Calculations for partition={}|user={}: {}",
+            "{} - Saved state for partition={}|user={}: {}",
             id,
             partition,
             user,
@@ -64,20 +79,4 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
       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);
-      partitions.forEach(partition -> stateRepository.save(
-          new StateDocument(
-              partition,
-              recordHandler.getState(partition).getState(),
-              adderResults.getState(partition))));
-      lastCommit = clock.instant();
-    }
-  }
 }