Skip to content

Commit 1a165a6

Browse files
committed
Fix testProcessMultipleChunks
1 parent 177da5f commit 1a165a6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ public void process(
411411
Consumer<Exception> errorListener
412412
) {
413413
ReservedStateChunk reservedStateChunk;
414-
ReservedStateVersion reservedStateVersion;
415414
LinkedHashSet<String> orderedHandlers;
415+
ReservedStateVersion reservedStateVersion = null;
416416

417417
try {
418418
reservedStateChunk = mergeReservedStateChunks(reservedStateChunks);
@@ -423,7 +423,7 @@ public void process(
423423
ErrorState errorState = new ErrorState(
424424
projectId,
425425
namespace,
426-
reservedStateChunks.getFirst().metadata().version(),
426+
reservedStateVersion != null ? reservedStateVersion.version() : null,
427427
versionCheck,
428428
e,
429429
ReservedStateErrorMetadata.ErrorKind.PARSING

server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ public void testProcessMultipleChunks() throws Exception {
404404
AtomicReference<Exception> exceptionRef = new AtomicReference<>();
405405
List<ReservedStateChunk> chunks = new ArrayList<>();
406406

407-
String[] randomStateKeys = generateRandomStringArray(randomIntBetween(5, 10), randomIntBetween(10, 15), false);
407+
String[] randomStateKeys = generateRandomStringArray(randomIntBetween(5, 10), randomIntBetween(10, 15), false, false);
408408

409409
List<ReservedClusterStateHandler<ProjectMetadata, ?>> projectHandlers = new ArrayList<>();
410410
for (var key : randomStateKeys) {

0 commit comments

Comments
 (0)