Merge remote-tracking branch 'origin/main' into lucene_snapshot

elasticsearchmachine · elasticsearchmachine · commit 5abf946fd979 · 2024-12-22T11:02:50.000Z
diff --git a/docs/changelog/119131.yaml b/docs/changelog/119131.yaml
@@ -0,0 +1,5 @@
+pr: 119131
+summary: Expose BwC enrich cache setting in plugin
+area: Ingest Node
+type: bug
+issues: []
diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java
@@ -308,7 +308,8 @@ public List<Setting<?>> getSettings() {
             COORDINATOR_PROXY_MAX_LOOKUPS_PER_REQUEST,
             COORDINATOR_PROXY_QUEUE_CAPACITY,
             ENRICH_MAX_FORCE_MERGE_ATTEMPTS,
-            CACHE_SIZE
+            CACHE_SIZE,
+            CACHE_SIZE_BWC
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,8 @@ public List<Setting<?>> getSettings() {`
`308`	`308`	`COORDINATOR_PROXY_MAX_LOOKUPS_PER_REQUEST,`
`309`	`309`	`COORDINATOR_PROXY_QUEUE_CAPACITY,`
`310`	`310`	`ENRICH_MAX_FORCE_MERGE_ATTEMPTS,`
`311`		`- CACHE_SIZE`
	`311`	`+ CACHE_SIZE,`
	`312`	`+ CACHE_SIZE_BWC`
`312`	`313`	`);`
`313`	`314`	`}`
`314`	`315`