Skip to content

Commit 64fcb66

Browse files
committed
Simplify resolver logic
1 parent 6cab045 commit 64fcb66

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

server/src/main/java/org/elasticsearch/ingest/IngestService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -950,9 +950,8 @@ private Function<String, Boolean> wrapResolverWithFeatureCheck(Function<String,
950950
DataStream.DATA_STREAM_FAILURE_STORE_FEATURE
951951
);
952952
return (indexName) -> {
953-
Boolean resolution = resolveFailureStore.apply(indexName);
954-
if (clusterHasFailureStoreFeature || resolution == null) {
955-
return resolution;
953+
if (clusterHasFailureStoreFeature) {
954+
return resolveFailureStore.apply(indexName);
956955
} else {
957956
// If we get a non-null result but the cluster is not yet fully updated with required node features,
958957
// force the result null to maintain old logic until all nodes are updated

0 commit comments

Comments
 (0)