|
@@ -63,6 +63,7 @@ import org.elasticsearch.script.ScriptType;
|
|
|
import org.elasticsearch.test.ESTestCase;
|
|
|
import org.elasticsearch.test.MockLogAppender;
|
|
|
import org.elasticsearch.threadpool.ThreadPool;
|
|
|
+import org.elasticsearch.threadpool.ThreadPool.Names;
|
|
|
import org.hamcrest.CustomTypeSafeMatcher;
|
|
|
import org.junit.Before;
|
|
|
import org.mockito.ArgumentMatcher;
|
|
@@ -160,7 +161,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
|
|
|
assertTrue(failure.get());
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
@@ -656,7 +658,7 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
|
|
|
ingestService.executeBulkRequest(bulkRequest.numberOfActions(), bulkRequest.requests(), failureHandler,
|
|
|
- completionHandler, indexReq -> {});
|
|
|
+ completionHandler, indexReq -> {}, Names.WRITE);
|
|
|
|
|
|
assertTrue(failure.get());
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
@@ -689,7 +691,7 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
ingestService.executeBulkRequest(bulkRequest.numberOfActions(), bulkRequest.requests(), failureHandler,
|
|
|
- completionHandler, indexReq -> {});
|
|
|
+ completionHandler, indexReq -> {}, Names.WRITE);
|
|
|
verify(failureHandler, times(1)).accept(
|
|
|
argThat(new CustomTypeSafeMatcher<>("failure handler was not called with the expected arguments") {
|
|
|
@Override
|
|
@@ -723,7 +725,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
final BiConsumer<Integer, Exception> failureHandler = mock(BiConsumer.class);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
verify(failureHandler, never()).accept(any(), any());
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
|
}
|
|
@@ -742,7 +745,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
final BiConsumer<Integer, Exception> failureHandler = mock(BiConsumer.class);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
verify(failureHandler, never()).accept(any(), any());
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
|
}
|
|
@@ -788,7 +792,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
final BiConsumer<Integer, Exception> failureHandler = mock(BiConsumer.class);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
verify(processor).execute(any(), any());
|
|
|
verify(failureHandler, never()).accept(any(), any());
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
@@ -820,7 +825,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
final BiConsumer<Integer, Exception> failureHandler = mock(BiConsumer.class);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
verify(processor).execute(eqIndexTypeId(indexRequest.version(), indexRequest.versionType(), emptyMap()), any());
|
|
|
verify(failureHandler, times(1)).accept(eq(0), any(RuntimeException.class));
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
@@ -862,7 +868,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
final BiConsumer<Integer, Exception> failureHandler = mock(BiConsumer.class);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
verify(failureHandler, never()).accept(eq(0), any(IngestProcessorException.class));
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
|
}
|
|
@@ -900,7 +907,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
final BiConsumer<Integer, Exception> failureHandler = mock(BiConsumer.class);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
verify(processor).execute(eqIndexTypeId(indexRequest.version(), indexRequest.versionType(), emptyMap()), any());
|
|
|
verify(failureHandler, times(1)).accept(eq(0), any(RuntimeException.class));
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
@@ -951,7 +959,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
BiConsumer<Integer, Exception> requestItemErrorHandler = mock(BiConsumer.class);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
- ingestService.executeBulkRequest(numRequest, bulkRequest.requests(), requestItemErrorHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(numRequest, bulkRequest.requests(), requestItemErrorHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
|
|
|
verify(requestItemErrorHandler, times(numIndexRequests)).accept(anyInt(), argThat(new ArgumentMatcher<Exception>() {
|
|
|
@Override
|
|
@@ -1003,7 +1012,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
BiConsumer<Integer, Exception> requestItemErrorHandler = mock(BiConsumer.class);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final BiConsumer<Thread, Exception> completionHandler = mock(BiConsumer.class);
|
|
|
- ingestService.executeBulkRequest(numRequest, bulkRequest.requests(), requestItemErrorHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(numRequest, bulkRequest.requests(), requestItemErrorHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
|
|
|
verify(requestItemErrorHandler, never()).accept(any(), any());
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
@@ -1060,7 +1070,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
final IndexRequest indexRequest = new IndexRequest("_index");
|
|
|
indexRequest.setPipeline("_id1").setFinalPipeline("_none");
|
|
|
indexRequest.source(randomAlphaOfLength(10), randomAlphaOfLength(10));
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
final IngestStats afterFirstRequestStats = ingestService.stats();
|
|
|
assertThat(afterFirstRequestStats.getPipelineStats().size(), equalTo(2));
|
|
|
|
|
@@ -1078,7 +1089,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
|
|
|
|
|
|
indexRequest.setPipeline("_id2");
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
final IngestStats afterSecondRequestStats = ingestService.stats();
|
|
|
assertThat(afterSecondRequestStats.getPipelineStats().size(), equalTo(2));
|
|
|
//total
|
|
@@ -1097,7 +1109,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
clusterState = IngestService.innerPut(putRequest, clusterState);
|
|
|
ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
|
|
|
indexRequest.setPipeline("_id1");
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
final IngestStats afterThirdRequestStats = ingestService.stats();
|
|
|
assertThat(afterThirdRequestStats.getPipelineStats().size(), equalTo(2));
|
|
|
//total
|
|
@@ -1121,7 +1134,8 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
clusterState = IngestService.innerPut(putRequest, clusterState);
|
|
|
ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
|
|
|
indexRequest.setPipeline("_id1");
|
|
|
- ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {});
|
|
|
+ ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest), failureHandler, completionHandler, indexReq -> {},
|
|
|
+ Names.WRITE);
|
|
|
final IngestStats afterForthRequestStats = ingestService.stats();
|
|
|
assertThat(afterForthRequestStats.getPipelineStats().size(), equalTo(2));
|
|
|
//total
|
|
@@ -1207,7 +1221,7 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
final IntConsumer dropHandler = mock(IntConsumer.class);
|
|
|
ingestService.executeBulkRequest(bulkRequest.numberOfActions(), bulkRequest.requests(), failureHandler,
|
|
|
- completionHandler, dropHandler);
|
|
|
+ completionHandler, dropHandler, Names.WRITE);
|
|
|
verify(failureHandler, never()).accept(any(), any());
|
|
|
verify(completionHandler, times(1)).accept(Thread.currentThread(), null);
|
|
|
verify(dropHandler, times(1)).accept(1);
|
|
@@ -1273,7 +1287,7 @@ public class IngestServiceTests extends ESTestCase {
|
|
|
new IndexRequest("_index").id("_doc-id").source(builder).setPipeline("_id").setFinalPipeline("_none");
|
|
|
|
|
|
ingestService.executeBulkRequest(1, Collections.singletonList(indexRequest),
|
|
|
- (integer, e) -> {}, (thread, e) -> {}, indexReq -> {});
|
|
|
+ (integer, e) -> {}, (thread, e) -> {}, indexReq -> {}, Names.WRITE);
|
|
|
}
|
|
|
|
|
|
assertThat(reference.get(), is(instanceOf(byte[].class)));
|