Skip to content

Commit 5f350af

Browse files
authored
Remove IncrementalClusterStateWriter & related code (#79738)
Today there is no code that uses `IncrementalClusterStateWriter` (except its tests) and the only places that use `MetaStateService` to write state are tests that simulate upgrade from pre-7.6.0 versions too. This commit removes the dead `IncrementalClusterStateWriter` class and moves the write methods of `MetaStateService` into the test framework.
1 parent bada1ba commit 5f350af

File tree

8 files changed

+135
-1014
lines changed

8 files changed

+135
-1014
lines changed

server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@
3030
import org.elasticsearch.cluster.routing.ShardRoutingState;
3131
import org.elasticsearch.cluster.routing.UnassignedInfo;
3232
import org.elasticsearch.cluster.service.ClusterService;
33-
import org.elasticsearch.core.CheckedConsumer;
3433
import org.elasticsearch.common.Priority;
3534
import org.elasticsearch.common.settings.Settings;
36-
import org.elasticsearch.xcontent.XContentFactory;
35+
import org.elasticsearch.core.CheckedConsumer;
3736
import org.elasticsearch.core.internal.io.IOUtils;
3837
import org.elasticsearch.env.NodeEnvironment;
3938
import org.elasticsearch.env.NodeMetadata;
@@ -44,6 +43,7 @@
4443
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
4544
import org.elasticsearch.test.ESIntegTestCase.Scope;
4645
import org.elasticsearch.test.InternalTestCluster.RestartCallback;
46+
import org.elasticsearch.xcontent.XContentFactory;
4747

4848
import java.io.IOException;
4949
import java.nio.file.Path;
@@ -516,11 +516,11 @@ public void testHalfDeletedIndexImport() throws Exception {
516516
final Path[] paths = internalCluster().getInstance(NodeEnvironment.class).nodeDataPaths();
517517
final String nodeId = client().admin().cluster().prepareNodesInfo(nodeName).clear().get().getNodes().get(0).getNode().getId();
518518

519-
writeBrokenMeta(metaStateService -> {
519+
writeBrokenMeta(nodeEnvironment -> {
520520
for (final Path path : paths) {
521521
IOUtils.rm(path.resolve(PersistedClusterStateService.METADATA_DIRECTORY_NAME));
522522
}
523-
metaStateService.writeGlobalState("test", Metadata.builder(metadata)
523+
MetaStateWriterUtils.writeGlobalState(nodeEnvironment, "test", Metadata.builder(metadata)
524524
// we remove the manifest file, resetting the term and making this look like an upgrade from 6.x, so must also reset the
525525
// term in the coordination metadata
526526
.coordinationMetadata(CoordinationMetadata.builder(metadata.coordinationMetadata()).term(0L).build())
@@ -534,14 +534,14 @@ public void testHalfDeletedIndexImport() throws Exception {
534534
assertBusy(() -> assertThat(internalCluster().getInstance(NodeEnvironment.class).availableIndexFolders(), empty()));
535535
}
536536

537-
private void writeBrokenMeta(CheckedConsumer<MetaStateService, IOException> writer) throws Exception {
538-
Map<String, MetaStateService> metaStateServices = Stream.of(internalCluster().getNodeNames())
539-
.collect(Collectors.toMap(Function.identity(), nodeName -> internalCluster().getInstance(MetaStateService.class, nodeName)));
537+
private void writeBrokenMeta(CheckedConsumer<NodeEnvironment, IOException> writer) throws Exception {
538+
Map<String, NodeEnvironment> nodeEnvironments = Stream.of(internalCluster().getNodeNames())
539+
.collect(Collectors.toMap(Function.identity(), nodeName -> internalCluster().getInstance(NodeEnvironment.class, nodeName)));
540540
internalCluster().fullRestart(new RestartCallback(){
541541
@Override
542542
public Settings onNodeStopped(String nodeName) throws Exception {
543-
final MetaStateService metaStateService = metaStateServices.get(nodeName);
544-
writer.accept(metaStateService);
543+
final NodeEnvironment nodeEnvironment = nodeEnvironments.get(nodeName);
544+
writer.accept(nodeEnvironment);
545545
return super.onNodeStopped(nodeName);
546546
}
547547
});

0 commit comments

Comments
 (0)