X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=365319780b02ecf106557787b484a1493cc3c43e;hb=907fdde716b24bc352f863c06337eda647bb1a59;hp=eef0d00d73e07f8eda6053d3334498f439e6f7d7;hpb=4210993f369acfa07ae8d388eb8e32517005de6f;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 eef0d00..3653197 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -3,7 +3,6 @@ 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.util.*;
@@ -11,12 +10,13 @@ import java.util.*;
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRebalanceListener implements ConsumerRebalanceListener
+public class ApplicationRebalanceListener implements RebalanceListener
 {
   private final ApplicationRecordHandler recordHandler;
   private final AdderResults adderResults;
   private final StateRepository stateRepository;
   private final String id;
+  private final String topic;
   private final Consumer consumer;
 
   private final Set<Integer> partitions = new HashSet<>();
@@ -33,6 +33,17 @@ public class ApplicationRebalanceListener implements ConsumerRebalanceListener
           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);
+        log.info(
+            "{} - Seeking to offset {} for partition {}",
+            id,
+            document.offset,
+            partition);
+      }
       recordHandler.addPartition(partition, document.state);
       for (String user : document.state.keySet())
       {
@@ -50,22 +61,18 @@ public class ApplicationRebalanceListener implements ConsumerRebalanceListener
   @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();
       log.info("{} - removing partition: {}", id, partition);
       this.partitions.remove(partition);
       Map<String, AdderResult> state = recordHandler.removePartition(partition);
+      Long offset = consumer.position(tp);
+      log.info(
+          "{} - offset of next unseen message for partition {} is {}",
+          id,
+          partition,
+          offset);
       for (String user : state.keySet())
       {
         log.info(
@@ -76,7 +83,37 @@ public class ApplicationRebalanceListener implements ConsumerRebalanceListener
             state.get(user));
       }
       Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
-      stateRepository.save(new StateDocument(partition, state, results));
+      stateRepository.save(new StateDocument(partition, state, results, offset));
     });
   }
+
+
+  @Override
+  public void beforeNextPoll()
+  {
+    partitions
+      .stream()
+      .forEach(partition ->
+      {
+        log.info("{} - persisting state & offset for partition: {}", id, partition);
+        Map<String, AdderResult> state = recordHandler.getState(partition).getState();
+        Long offset = consumer.position(new TopicPartition(topic, partition));
+        log.info(
+          "{} - offset of next unseen message for partition {} is {}",
+          id,
+          partition,
+          offset);
+        for (String user : state.keySet())
+        {
+          log.info(
+            "{} - Saved state for partition={}|user={}: {}",
+            id,
+            partition,
+            user,
+            state.get(user));
+        }
+        Map<String, List<AdderResult>> results = adderResults.getState(partition);
+        stateRepository.save(new StateDocument(partition, state, results, offset));
+      });
+  }
 }