Log-Meldungen bei Assign/Revoke verbessert und angeglichen

[demos/kafka/training] / src / main / java / de / juplo / kafka / ApplicationRebalanceListener.java

diff --git a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
index 6776c0d..109b205 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -2,6 +2,7 @@ package de.juplo.kafka;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.common.TopicPartition;
 
 import java.time.Clock;
@@ -18,12 +19,15 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   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 Set<Integer> partitions = new HashSet<>();
 
   private Instant lastCommit = Instant.EPOCH;
+  private boolean commitsEnabled = true;
 
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
@@ -37,7 +41,27 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
           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())
+      {
+        log.info(
+            "{} - Restored state for partition={}|user={}: {}",
+            id,
+            partition,
+            user,
+            document.state.get(user));
+      }
       adderResults.addPartition(partition, document.results);
     });
   }
@@ -50,18 +74,31 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
       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())
+      Long offset = consumer.position(tp);
+      if (commitsEnabled)
       {
         log.info(
-            "{} - Calculations for partition={}|user={}: {}",
+            "{} - Storing {} as offset of next message for partition {}",
             id,
-            partition,
-            user,
-            state.get(user));
+            offset,
+            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, offset));
+      }
+      else
+      {
+        log.info("Offset commits are disabled! Last commit: {}", lastCommit);
       }
-      Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
-      stateRepository.save(new StateDocument(partition, state, results));
     });
   }
 
@@ -69,15 +106,34 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   @Override
   public void beforeNextPoll()
   {
+    if (!commitsEnabled)
+    {
+      log.info("Offset commits are disabled! Last commit: {}", lastCommit);
+      return;
+    }
+
     if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
     {
-      log.debug("Storing data, last commit: {}", lastCommit);
+      log.debug("Storing data and offsets, last commit: {}", lastCommit);
       partitions.forEach(partition -> stateRepository.save(
           new StateDocument(
               partition,
               recordHandler.getState(partition).getState(),
-              adderResults.getState(partition))));
+              adderResults.getState(partition),
+              consumer.position(new TopicPartition(topic, partition)))));
       lastCommit = clock.instant();
     }
   }
+
+  @Override
+  public void enableCommits()
+  {
+    commitsEnabled = true;
+  }
+
+  @Override
+  public void disableCommits()
+  {
+    commitsEnabled = false;
+  }
 }