ISPN-7068 Fix the MassIndexer with Elasticsearch

infinispan · Jan 20, 2017 · 9630ca1 · 9630ca1
1 parent 36e817f
commit 9630ca1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/query/src/main/java/org/infinispan/query/impl/massindex/IndexUpdater.java b/query/src/main/java/org/infinispan/query/impl/massindex/IndexUpdater.java
@@ -50,6 +50,10 @@ public void purge(Class<?> entityType) {
       defaultBatchBackend.purge(Collections.singleton(entityType));
    }
 
+   public void waitForAsyncCompletion() {
+      defaultBatchBackend.awaitAsyncProcessingCompletion();
+   }
+
    public void updateIndex(Object key, Object value) {
       if (value != null) {
          if (!Thread.currentThread().isInterrupted()) {

diff --git a/query/src/main/java/org/infinispan/query/impl/massindex/IndexWorker.java b/query/src/main/java/org/infinispan/query/impl/massindex/IndexWorker.java
@@ -62,6 +62,7 @@ protected void preIndex() {
    }
 
    protected void postIndex() {
+      indexUpdater.waitForAsyncCompletion();
       if (flush) indexUpdater.flush(entity);
    }