Skip to content

Commit 2d7d6fe

Browse files
authored
Passing parent task id to the refresh request within reindex data streams (elastic#121533) (elastic#121605)
1 parent facce5f commit 2d7d6fe

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexTransportAction.java

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -368,26 +368,24 @@ private void sanityCheck(
368368
) {
369369
if (Assertions.ENABLED) {
370370
logger.debug("Comparing source [{}] and dest [{}] doc counts", sourceIndexName, destIndexName);
371-
client.execute(
372-
RefreshAction.INSTANCE,
373-
new RefreshRequest(destIndexName),
374-
listener.delegateFailureAndWrap((delegate, ignored) -> {
375-
getIndexDocCount(sourceIndexName, parentTaskId, delegate.delegateFailureAndWrap((delegate1, sourceCount) -> {
376-
getIndexDocCount(destIndexName, parentTaskId, delegate1.delegateFailureAndWrap((delegate2, destCount) -> {
377-
assert Objects.equals(sourceCount, destCount)
378-
: String.format(
379-
Locale.ROOT,
380-
"source index [%s] has %d docs and dest [%s] has %d docs",
381-
sourceIndexName,
382-
sourceCount,
383-
destIndexName,
384-
destCount
385-
);
386-
delegate2.onResponse(null);
387-
}));
371+
RefreshRequest refreshRequest = new RefreshRequest(destIndexName);
372+
refreshRequest.setParentTask(parentTaskId);
373+
client.execute(RefreshAction.INSTANCE, refreshRequest, listener.delegateFailureAndWrap((delegate, ignored) -> {
374+
getIndexDocCount(sourceIndexName, parentTaskId, delegate.delegateFailureAndWrap((delegate1, sourceCount) -> {
375+
getIndexDocCount(destIndexName, parentTaskId, delegate1.delegateFailureAndWrap((delegate2, destCount) -> {
376+
assert Objects.equals(sourceCount, destCount)
377+
: String.format(
378+
Locale.ROOT,
379+
"source index [%s] has %d docs and dest [%s] has %d docs",
380+
sourceIndexName,
381+
sourceCount,
382+
destIndexName,
383+
destCount
384+
);
385+
delegate2.onResponse(null);
388386
}));
389-
})
390-
);
387+
}));
388+
}));
391389
} else {
392390
listener.onResponse(null);
393391
}

0 commit comments

Comments
 (0)