X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=da725551acf71c392c8135f4e4291d01cf5273c4;hb=4cc907defd4f6e1a52df13e7018eac44963cecdf;hp=9e75112516bb9129720bcbedbcd4c045889c0b3b;hpb=12c1ce703ef76b75d995f94d1689c894dde1406a;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 9e75112..da72555 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -3,25 +3,21 @@ 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.*;
-import java.util.concurrent.CountDownLatch;
 
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRebalanceListener implements ConsumerRebalanceListener
+public class ApplicationRebalanceListener implements RebalanceListener
 {
-  private final Consumer consumer;
   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<>();
 
@@ -37,6 +33,12 @@ public class ApplicationRebalanceListener implements ConsumerRebalanceListener
           stateRepository
               .findById(Integer.toString(partition))
               .orElse(new StateDocument(partition));
+      log.info(
+        "{} - Offset of next unseen message for partition {}: {}",
+        id,
+        partition,
+        document.offset);
+      consumer.seek(tp, document.offset);
       recordHandler.addPartition(partition, document.state);
       for (String user : document.state.keySet())
       {
@@ -54,30 +56,18 @@ public class ApplicationRebalanceListener implements ConsumerRebalanceListener
   @Override
   public void onPartitionsRevoked(Collection<TopicPartition> partitions)
   {
-    log.info("{} - Commiting offsets for all previously assigned partitions", id);
-    CountDownLatch commitDone = new CountDownLatch(1);
-    consumer.commitAsync((offsets, e) ->
-    {
-      commitDone.countDown();
-      if (e == null)
-      {
-        log.error("{} - Could not commit offsets to Kafka!", id, e);
-      }
-      else
-      {
-        offsets.entrySet().stream().forEach(entry ->
-        {
-          log.info("{} - Commited offset for {}: {}", id, entry.getKey(), entry.getValue());
-        });
-      }
-    });
-
     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(
@@ -88,21 +78,7 @@ 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));
     });
-
-    try
-    {
-      log.debug("{} - Waiting for async commit to complete", id);
-      commitDone.await();
-    }
-    catch (InterruptedException e)
-    {
-      log.warn(
-        "{} - Interrupted while waiting for async commit in onPartitionsRevoked({})",
-        id,
-        partitions,
-        e);
-    }
   }
 }