From af61a51e229468a9284501b11daee384624121f3 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Wed, 7 Dec 2016 16:52:58 +0000 Subject: [PATCH] Fix results not being persisted (elastic/elasticsearch#489) Original commit: elastic/x-pack-elasticsearch@d0ee02ccf66e2bfc7fcb19b237c37d06cbc24f21 --- .../process/autodetect/output/AutoDetectResultProcessor.java | 2 +- .../autodetect/output/AutoDetectResultProcessorTests.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/process/autodetect/output/AutoDetectResultProcessor.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/process/autodetect/output/AutoDetectResultProcessor.java index a6d8ef16731..f1e0ba28bc6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/process/autodetect/output/AutoDetectResultProcessor.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/process/autodetect/output/AutoDetectResultProcessor.java @@ -109,7 +109,7 @@ public class AutoDetectResultProcessor { // persist after deleting interim results in case the new // results are also interim - context.bulkResultsPersister.persistBucket(bucket); + context.bulkResultsPersister.persistBucket(bucket).executeRequest(); context.bulkResultsPersister = persister.bulkPersisterBuilder(context.jobId); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/job/process/autodetect/output/AutoDetectResultProcessorTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/job/process/autodetect/output/AutoDetectResultProcessorTests.java index d882088735c..ccd6e55f86f 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/job/process/autodetect/output/AutoDetectResultProcessorTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/job/process/autodetect/output/AutoDetectResultProcessorTests.java @@ -65,6 +65,7 @@ public class AutoDetectResultProcessorTests extends ESTestCase { JobResultsPersister persister = mock(JobResultsPersister.class); JobResultsPersister.Builder bulkBuilder = mock(JobResultsPersister.Builder.class); when(persister.bulkPersisterBuilder(JOB_ID)).thenReturn(bulkBuilder); + when(bulkBuilder.persistBucket(any(Bucket.class))).thenReturn(bulkBuilder); AutoDetectResultProcessor processor = new AutoDetectResultProcessor(renormaliser, persister, null); AutoDetectResultProcessor.Context context = new AutoDetectResultProcessor.Context(JOB_ID, false, bulkBuilder); @@ -75,6 +76,7 @@ public class AutoDetectResultProcessorTests extends ESTestCase { processor.processResult(context, result); verify(bulkBuilder, times(1)).persistBucket(bucket); + verify(bulkBuilder, times(1)).executeRequest(); verify(persister, times(1)).bulkPersisterBuilder(JOB_ID); verify(persister, never()).deleteInterimResults(JOB_ID); verifyNoMoreInteractions(persister); @@ -85,6 +87,7 @@ public class AutoDetectResultProcessorTests extends ESTestCase { JobResultsPersister persister = mock(JobResultsPersister.class); JobResultsPersister.Builder bulkBuilder = mock(JobResultsPersister.Builder.class); when(persister.bulkPersisterBuilder(JOB_ID)).thenReturn(bulkBuilder); + when(bulkBuilder.persistBucket(any(Bucket.class))).thenReturn(bulkBuilder); AutoDetectResultProcessor processor = new AutoDetectResultProcessor(renormaliser, persister, null); AutoDetectResultProcessor.Context context = new AutoDetectResultProcessor.Context(JOB_ID, false, bulkBuilder); @@ -94,6 +97,7 @@ public class AutoDetectResultProcessorTests extends ESTestCase { processor.processResult(context, result); verify(bulkBuilder, times(1)).persistBucket(bucket); + verify(bulkBuilder, times(1)).executeRequest(); verify(persister, times(1)).deleteInterimResults(JOB_ID); verify(persister, times(1)).bulkPersisterBuilder(JOB_ID); verifyNoMoreInteractions(persister);