Skip to content

Commit 004af14

Browse files
authored
Remove ClusterStateSerializationTests (#130877)
These tests do not seem valuable anymore, now that multi-project has been merged some time ago. Additionally, creating objects for a cluster state this way is tricky, as those objects might get new features/fields, which would break serialization. Closes #130872
1 parent f9b9e7c commit 004af14

File tree

3 files changed

+13
-88
lines changed

3 files changed

+13
-88
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,6 @@ tests:
403403
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
404404
method: test {p0=mtermvectors/10_basic/Tests catching other exceptions per item}
405405
issue: https://github.com/elastic/elasticsearch/issues/122414
406-
- class: org.elasticsearch.cluster.ClusterStateSerializationTests
407-
method: testSerializationPreMultiProject
408-
issue: https://github.com/elastic/elasticsearch/issues/130872
409406
- class: org.elasticsearch.search.SearchWithRejectionsIT
410407
method: testOpenContextsAfterRejections
411408
issue: https://github.com/elastic/elasticsearch/issues/130821

server/src/test/java/org/elasticsearch/cluster/ClusterStateSerializationTests.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.cluster.metadata;
1111

1212
import org.elasticsearch.TransportVersion;
13+
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.cluster.ClusterModule;
1415
import org.elasticsearch.cluster.Diff;
1516
import org.elasticsearch.cluster.coordination.CoordinationMetadata;
@@ -45,6 +46,7 @@
4546
import org.elasticsearch.persistent.PersistentTasksService;
4647
import org.elasticsearch.test.AbstractChunkedSerializingTestCase;
4748
import org.elasticsearch.test.ESTestCase;
49+
import org.elasticsearch.test.TransportVersionUtils;
4850
import org.elasticsearch.test.index.IndexVersionUtils;
4951
import org.elasticsearch.test.rest.ObjectPath;
5052
import org.elasticsearch.threadpool.ThreadPool;
@@ -613,6 +615,17 @@ public void testMultiProjectSerialization() throws IOException {
613615
}
614616
}
615617

618+
public void testUnableToSerializeNonDefaultProjectBeforeMultiProject() {
619+
final var projectId = randomUniqueProjectId();
620+
Metadata metadata = Metadata.builder().put(ProjectMetadata.builder(projectId)).build();
621+
622+
try (BytesStreamOutput output = new BytesStreamOutput()) {
623+
output.setTransportVersion(TransportVersionUtils.getPreviousVersion(TransportVersions.MULTI_PROJECT));
624+
var e = assertThrows(UnsupportedOperationException.class, () -> metadata.writeTo(output));
625+
assertEquals("There is 1 project, but it has id [" + projectId + "] rather than default", e.getMessage());
626+
}
627+
}
628+
616629
public void testGetNonExistingProjectThrows() {
617630
final List<ProjectMetadata> projects = IntStream.range(0, between(1, 3))
618631
.mapToObj(i -> randomProject(ProjectId.fromId("p_" + i), between(0, 5)))

0 commit comments

Comments
 (0)