X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=d31929519e61a4a6fc18f84e4590a7295f757c4f;hb=384ed293b9d6d71f68031f92bd7bf60670a7ba4b;hp=cd9da64538cf0097d669fc26606120f72aba4d90;hpb=e11c6152c721440d4a599a6f5fe0fe46f2283f31;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..d319295 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -5,28 +5,21 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.Consumer;
 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 CommittingConsumerRebalanceListener
 {
   private final ApplicationRecordHandler recordHandler;
   private final AdderResults adderResults;
   private final StateRepository stateRepository;
   private final String id;
-  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<>();
 
-  private Instant lastCommit = Instant.EPOCH;
   private boolean commitsEnabled = true;
 
   @Override
@@ -35,19 +28,22 @@ 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)
+      recordHandler.addPartition(partition, document.state);
+      for (String user : document.state.keySet())
       {
-        // Only seek, if a stored offset was found
-        // Otherwise: Use initial offset, generated by Kafka
-        consumer.seek(tp, document.offset);
+        log.info(
+            "{} - Restored state for partition={}|user={}: {}",
+            id,
+            partition,
+            user,
+            document.state.get(user));
       }
-      recordHandler.addPartition(partition, document.state);
       adderResults.addPartition(partition, document.results);
     });
   }
@@ -55,50 +51,37 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   @Override
   public void onPartitionsRevoked(Collection<TopicPartition> partitions)
   {
-    partitions.forEach(tp ->
+    if (commitsEnabled)
     {
-      Integer partition = tp.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("{} - Commiting offsets for all previously assigned partitions", id);
+      try
       {
-        Map<String, AdderResult> state = recordHandler.removePartition(partition);
-        Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
-        stateRepository.save(new StateDocument(partition, state, results, offset));
+        consumer.commitSync();
       }
-      else
+      catch (Exception e)
       {
-        log.info("Offset commits are disabled! Last commit: {}", lastCommit);
+        log.warn("{} - Could not commit offsets in onPartitionsRevoked():", id, e);
       }
-    });
-  }
-
-
-  @Override
-  public void beforeNextPoll()
-  {
-    if (!commitsEnabled)
-    {
-      log.info("Offset commits are disabled! Last commit: {}", lastCommit);
-      return;
     }
 
-    if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
+    partitions.forEach(tp ->
     {
-      log.debug("Storing data and offsets, last commit: {}", lastCommit);
-      partitions.forEach(partition -> stateRepository.save(
-          new StateDocument(
-              partition,
-              recordHandler.getState(partition).getState(),
-              adderResults.getState(partition),
-              consumer.position(new TopicPartition(topic, partition)))));
-      lastCommit = clock.instant();
-    }
+      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())
+      {
+        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));
+    });
   }
 
   @Override