Add re-entrant lock protection around adding message

slackhq · Feb 16, 2024 · 102fa3b · 102fa3b
1 parent bfa3a76
commit 102fa3b
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/kaldb/src/main/java/com/slack/kaldb/logstore/LuceneIndexStoreImpl.java b/kaldb/src/main/java/com/slack/kaldb/logstore/LuceneIndexStoreImpl.java
@@ -257,11 +257,16 @@ private void handleNonFatal(Throwable ex) {
   public void addMessage(LogMessage message) {
     try {
       messagesReceivedCounter.increment();
-      if (indexWriter.isPresent()) {
-        indexWriter.get().addDocument(documentBuilder.fromMessage(message));
-      } else {
-        LOG.error("IndexWriter should never be null when adding a message");
-        throw new IllegalStateException("IndexWriter should never be null when adding a message");
+      indexWriterLock.lock();
+      try {
+        if (indexWriter.isPresent()) {
+          indexWriter.get().addDocument(documentBuilder.fromMessage(message));
+        } else {
+          LOG.error("IndexWriter should never be null when adding a message");
+          throw new IllegalStateException("IndexWriter should never be null when adding a message");
+        }
+      } finally {
+        indexWriterLock.unlock();
       }
     } catch (FieldDefMismatchException | IllegalArgumentException e) {
       LOG.error(String.format("Indexing message %s failed with error:", message), e);