X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=63d57dfb1bde831013169d45476ff5df946508c0;hb=627763878b235ba168c7f55a1ef448851b027bfc;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..63d57df 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -3,28 +3,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.*;
-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 Consumer consumer;
 
   private final Set<Integer> partitions = new HashSet<>();
 
+  private boolean commitsEnabled = true;
+
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
   {
@@ -54,23 +51,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) ->
+    if (commitsEnabled)
     {
-      commitDone.countDown();
-      if (e == null)
+      log.info("{} - Commiting offsets for all previously assigned partitions", id);
+      try
       {
-        log.error("{} - Could not commit offsets to Kafka!", id, e);
+        consumer.commitSync();
       }
-      else
+      catch (Exception e)
       {
-        offsets.entrySet().stream().forEach(entry ->
-        {
-          log.info("{} - Commited offset for {}: {}", id, entry.getKey(), entry.getValue());
-        });
+        log.warn("{} - Could not commit offsets in onPartitionsRevoked():", id, e);
       }
-    });
+    }
 
     partitions.forEach(tp ->
     {
@@ -90,19 +82,17 @@ public class ApplicationRebalanceListener implements ConsumerRebalanceListener
       Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
       stateRepository.save(new StateDocument(partition, state, results));
     });
+  }
 
-    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);
-    }
+  @Override
+  public void enableCommits()
+  {
+    commitsEnabled = true;
+  }
+
+  @Override
+  public void disableCommits()
+  {
+    commitsEnabled = false;
   }
 }