X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FEndlessConsumer.java;h=6af3765d0532a59f821d031927d3cc38de2400bf;hb=d1ce252495c63a971d1734a35b10cf26313d95fb;hp=03a89dce240adef37f4ba9f332ed49594a4ab46b;hpb=dd41cf0d4a8b1cf00158dd5ce902bba1ab67389b;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/EndlessConsumer.java b/src/main/java/de/juplo/kafka/EndlessConsumer.java
index 03a89dc..6af3765 100644
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -32,11 +32,13 @@ public class EndlessConsumer implements Runnable
   private final Lock lock = new ReentrantLock();
   private final Condition condition = lock.newCondition();
   private boolean running = false;
+  private Exception exception;
   private long consumed = 0;
   private KafkaConsumer<String, String> consumer = null;
 
 
-  private final Map<Integer, Map<String, Integer>> seen = new HashMap<>();
+  private final Map<Integer, Map<String, Long>> seen = new HashMap<>();
+  private final Map<Integer, Long> offsets = new HashMap<>();
 
 
   public EndlessConsumer(
@@ -79,15 +81,24 @@ public class EndlessConsumer implements Runnable
         {
           partitions.forEach(tp ->
           {
-            log.info("{} - removing partition: {}", id, tp);
-            Map<String, Integer> removed = seen.remove(tp.partition());
+            Integer partition = tp.partition();
+            Long newOffset = consumer.position(tp);
+            Long oldOffset = offsets.remove(partition);
+            log.info(
+                "{} - removing partition: {}, consumed {} records (offset {} -> {})",
+                id,
+                partition,
+                newOffset - oldOffset,
+                oldOffset,
+                newOffset);
+            Map<String, Long> removed = seen.remove(partition);
             for (String key : removed.keySet())
             {
               log.info(
                   "{} - Seen {} messages for partition={}|key={}",
                   id,
                   removed.get(key),
-                  tp.partition(),
+                  partition,
                   key);
             }
           });
@@ -98,8 +109,11 @@ public class EndlessConsumer implements Runnable
         {
           partitions.forEach(tp ->
           {
-            log.info("{} - adding partition: {}", id, tp);
-            seen.put(tp.partition(), new HashMap<>());
+            Integer partition = tp.partition();
+            Long offset = consumer.position(tp);
+            log.info("{} - adding partition: {}, offset={}", id, partition, offset);
+            offsets.put(partition, offset);
+            seen.put(partition, new HashMap<>());
           });
         }
       });
@@ -126,12 +140,12 @@ public class EndlessConsumer implements Runnable
 
           Integer partition = record.partition();
           String key = record.key() == null ? "NULL" : record.key();
-          Map<String, Integer> byKey = seen.get(partition);
+          Map<String, Long> byKey = seen.get(partition);
 
           if (!byKey.containsKey(key))
-            byKey.put(key, 0);
+            byKey.put(key, 0l);
 
-          int seenByKey = byKey.get(key);
+          long seenByKey = byKey.get(key);
           seenByKey++;
           byKey.put(key, seenByKey);
         }
@@ -145,7 +159,7 @@ public class EndlessConsumer implements Runnable
     catch(Exception e)
     {
       log.error("{} - Unexpected error: {}", id, e.toString(), e);
-      shutdown();
+      shutdown(e);
     }
     finally
     {
@@ -156,11 +170,17 @@ public class EndlessConsumer implements Runnable
   }
 
   private void shutdown()
+  {
+    shutdown(null);
+  }
+
+  private void shutdown(Exception e)
   {
     lock.lock();
     try
     {
       running = false;
+      exception = e;
       condition.signal();
     }
     finally
@@ -169,7 +189,7 @@ public class EndlessConsumer implements Runnable
     }
   }
 
-  public Map<Integer, Map<String, Integer>> getSeen()
+  public Map<Integer, Map<String, Long>> getSeen()
   {
     return seen;
   }
@@ -184,6 +204,7 @@ public class EndlessConsumer implements Runnable
 
       log.info("{} - Starting - consumed {} messages before", id, consumed);
       running = true;
+      exception = null;
       executor.submit(this);
     }
     finally
@@ -232,4 +253,33 @@ public class EndlessConsumer implements Runnable
       log.info("{}: Consumed {} messages in total, exiting!", id, consumed);
     }
   }
+
+  public boolean running()
+  {
+    lock.lock();
+    try
+    {
+      return running;
+    }
+    finally
+    {
+      lock.unlock();
+    }
+  }
+
+  public Optional<Exception> exitStatus()
+  {
+    lock.lock();
+    try
+    {
+      if (running)
+        throw new IllegalStateException("No exit-status available: Consumer instance " + id + " is running!");
+
+      return Optional.ofNullable(exception);
+    }
+    finally
+    {
+      lock.unlock();
+    }
+  }
 }