[Transform] Don't search if all indices are unchanged between checkpoints #77204
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -523,10 +523,8 @@ private void finalizeCheckpoint(ActionListener<Void> listener) { | |
| } | ||
|
|
||
| if (lastCheckpoint != null) { | ||
| long docsIndexed = progress.getDocumentsIndexed(); | ||
| long docsProcessed = progress.getDocumentsProcessed(); | ||
|
|
||
| long durationMs = System.currentTimeMillis() - lastCheckpoint.getTimestamp(); | ||
| getStats().incrementCheckpointExponentialAverages(durationMs < 0 ? 0 : durationMs, docsIndexed, docsProcessed); | ||
|
|
@@ -1131,7 +1129,7 @@ private SearchRequest buildQueryToFindChanges() { | |
| // TODO: if buildChangesQuery changes the query it get overwritten | ||
| sourceBuilder.query(filteredQuery); | ||
|
|
||
| logger.debug("[{}] Querying {} for changes: {}", getJobId(), request.indices(), sourceBuilder); | ||
|
|
||
| return request.source(sourceBuilder); | ||
| } | ||
|
|
||
|
|
@@ -1168,7 +1166,7 @@ private SearchRequest buildQueryToUpdateDestinationIndex() { | |
| } | ||
|
|
||
| sourceBuilder.query(queryBuilder); | ||
| logger.debug("[{}] Querying {} for data: {}", getJobId(), request.indices(), sourceBuilder); | ||
|
Member
There was a problem hiding this comment. I always thought that the logger would serialize the strings unless we provided a message provider. Consequently, if we weren't on debug level, we are serializing the sourceBuilder unnecessarily. |
||
|
|
||
| return request.source(sourceBuilder) | ||
| .allowPartialSearchResults(false) // shard failures should fail the request | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,32 +68,8 @@ | |
|
|
||
| public class ClientTransformIndexerTests extends ESTestCase { | ||
|
|
||
| public void testAuditOnFinishFrequency() { | ||
| ClientTransformIndexer indexer = createTestIndexer(); | ||
| List<Boolean> shouldAudit = IntStream.range(0, 100_000).boxed().map(indexer::shouldAuditOnFinish).collect(Collectors.toList()); | ||
|
|
||
| // Audit every checkpoint for the first 10 | ||
|
|
@@ -125,6 +101,17 @@ public void testAudiOnFinishFrequency() { | |
| assertFalse(shouldAudit.get(11_999)); | ||
| } | ||
|
|
||
| public void testDoSearchGivenNoIndices() { | ||
| ClientTransformIndexer indexer = createTestIndexer(); | ||
| SearchRequest searchRequest = new SearchRequest(new String[0]); | ||
| Tuple<String, SearchRequest> namedSearchRequest = new Tuple<>("test", searchRequest); | ||
| indexer.doSearch(namedSearchRequest, ActionListener.wrap( | ||
| // A search of zero indices should return null rather than attempt to search all indices | ||
| ESTestCase::assertNull, | ||
| e -> fail(e.getMessage()) | ||
| )); | ||
| } | ||
|
|
||
| public void testPitInjection() throws InterruptedException { | ||
| TransformConfig config = TransformConfigTests.randomTransformConfig(); | ||
|
|
||
|
|
@@ -334,7 +321,7 @@ private static class MockClientTransformIndexer extends ClientTransformIndexer { | |
|
|
||
| @Override | ||
| protected Tuple<String, SearchRequest> buildSearchRequest() { | ||
| return new Tuple<>("mock", new SearchRequest("source_index").source(new SearchSourceBuilder())); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -427,4 +414,31 @@ private <T> void assertAsync(Consumer<ActionListener<T>> function, Consumer<T> f | |
| function.accept(listener); | ||
| assertTrue("timed out after 5s", latch.await(5, TimeUnit.SECONDS)); | ||
| } | ||
|
|
||
| private ClientTransformIndexer createTestIndexer() { | ||
| ThreadPool threadPool = mock(ThreadPool.class); | ||
| when(threadPool.executor("generic")).thenReturn(mock(ExecutorService.class)); | ||
|
|
||
| return new ClientTransformIndexer( | ||
| mock(ThreadPool.class), | ||
| new TransformServices( | ||
| mock(IndexBasedTransformConfigManager.class), | ||
| mock(TransformCheckpointService.class), | ||
| mock(TransformAuditor.class), | ||
| mock(SchedulerEngine.class) | ||
| ), | ||
| mock(CheckpointProvider.class), | ||
| new AtomicReference<>(IndexerState.STOPPED), | ||
| null, | ||
| mock(Client.class), | ||
| mock(TransformIndexerStats.class), | ||
| mock(TransformConfig.class), | ||
| null, | ||
| new TransformCheckpoint("transform", Instant.now().toEpochMilli(), 0L, Collections.emptyMap(), Instant.now().toEpochMilli()), | ||
| new TransformCheckpoint("transform", Instant.now().toEpochMilli(), 2L, Collections.emptyMap(), Instant.now().toEpochMilli()), | ||
| new SeqNoPrimaryTermAndIndex(1, 1, TransformInternalIndexConstants.LATEST_INDEX_NAME), | ||
| mock(TransformContext.class), | ||
| false | ||
| ); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The introduction of a magic value
nullis dangerous, what if the client returnsnull. It seems better to return an empty result set, so thatnullcauses the transform to fail as before.