Skip to content

Commit 17e4d0f

Browse files
committed
merging main
2 parents 6784895 + d39cc7d commit 17e4d0f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ tests:
7676
- class: org.elasticsearch.versioning.ConcurrentSeqNoVersioningIT
7777
method: testSeqNoCASLinearizability
7878
issue: https://github.com/elastic/elasticsearch/issues/117249
79-
- class: org.elasticsearch.discovery.ClusterDisruptionIT
80-
method: testAckedIndexing
81-
issue: https://github.com/elastic/elasticsearch/issues/117024
8279
- class: org.elasticsearch.xpack.inference.InferenceRestIT
8380
method: test {p0=inference/40_semantic_text_query/Query a field that uses the default ELSER 2 endpoint}
8481
issue: https://github.com/elastic/elasticsearch/issues/117027

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,10 @@ private void construct(
721721
modules.bindToInstance(SamplingService.class, samplingService);
722722
clusterService.addListener(samplingService);
723723

724+
SamplingService samplingService = new SamplingService(scriptService, clusterService);
725+
modules.bindToInstance(SamplingService.class, samplingService);
726+
clusterService.addListener(samplingService);
727+
724728
FailureStoreMetrics failureStoreMetrics = new FailureStoreMetrics(telemetryProvider.getMeterRegistry());
725729
final IngestService ingestService = new IngestService(
726730
clusterService,

0 commit comments

Comments
 (0)