Skip to content

Fix testProcessMultipleChunks #125304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 24, 2025
Merged

Fix testProcessMultipleChunks #125304

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1a165a6
Fix testProcessMultipleChunks
jfreden Mar 20, 2025
fb0e71a
Merge branch 'main' into fix_testProcessMultipleChunks
jfreden Mar 20, 2025
036bc00
fixup! bug
jfreden Mar 20, 2025
16767a7
Merge remote-tracking branch 'upstream/main' into fix_testProcessMult…
jfreden Mar 20, 2025
628033f
fixup! unmute test
jfreden Mar 20, 2025
4861cc9
Merge branch 'main' into fix_testProcessMultipleChunks
jfreden Mar 20, 2025
fc08a60
fixup! Code review comment
jfreden Mar 24, 2025
959b713
Merge remote-tracking branch 'upstream/main' into fix_testProcessMult…
jfreden Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,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:
#
Expand Down
2 changes: 1 addition & 1 deletion ...er/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ public void process(
ErrorState errorState = new ErrorState(
projectId,
namespace,
reservedStateChunks.getFirst().metadata().version(),
reservedStateChunks.isEmpty() ? null : reservedStateChunks.getFirst().metadata().version(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use EMPTY_VERSION?

elasticsearch/server/src/main/java/org/elasticsearch/cluster/metadata/ReservedStateMetadata.java

Line 51 in eceb178

public static final Long EMPTY_VERSION = -1L; // use -1 as sentinel for empty metadata

versionCheck,
e,
ReservedStateErrorMetadata.ErrorKind.PARSING
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ public void testProcessMultipleChunks() throws Exception {
AtomicReference<Exception> exceptionRef = new AtomicReference<>();
List<ReservedStateChunk> 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<ReservedClusterStateHandler<ProjectMetadata, ?>> projectHandlers = new ArrayList<>();
for (var key : randomStateKeys) {
Expand Down