diff --git a/muted-tests.yml b/muted-tests.yml index 2cb96c3c42d4e..16834cc782469 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -390,9 +390,6 @@ tests: - class: org.elasticsearch.index.engine.ThreadPoolMergeSchedulerTests method: testSchedulerCloseWaitsForRunningMerge issue: https://github.com/elastic/elasticsearch/issues/125236 -- class: org.elasticsearch.reservedstate.service.ReservedClusterStateServiceTests - method: testProcessMultipleChunks - issue: https://github.com/elastic/elasticsearch/issues/125305 # Examples: # diff --git a/server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java b/server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java index d33a61e1a3bfd..d455a978dcf70 100644 --- a/server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java +++ b/server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java @@ -423,7 +423,7 @@ public void process( ErrorState errorState = new ErrorState( projectId, namespace, - reservedStateChunks.getFirst().metadata().version(), + reservedStateChunks.isEmpty() ? EMPTY_VERSION : reservedStateChunks.getFirst().metadata().version(), versionCheck, e, ReservedStateErrorMetadata.ErrorKind.PARSING diff --git a/server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java b/server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java index 1cb2190850ed9..ac860d1b21508 100644 --- a/server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java @@ -404,7 +404,7 @@ public void testProcessMultipleChunks() throws Exception { AtomicReference exceptionRef = new AtomicReference<>(); List chunks = new ArrayList<>(); - String[] randomStateKeys = generateRandomStringArray(randomIntBetween(5, 10), randomIntBetween(10, 15), false); + String[] randomStateKeys = generateRandomStringArray(randomIntBetween(5, 10), randomIntBetween(10, 15), false, false); List> projectHandlers = new ArrayList<>(); for (var key : randomStateKeys) {