revert Coordinator logic

server/src/main/java/org/opensearch/cluster/coordination/CoordinationState.java

@@ -66,7 +66,6 @@ public class CoordinationState {
 
  // persisted state
  private final PersistedState persistedState;
- private final PersistedState remotePersistedState;
 
  // transient state
  private VoteCollection joinVotes;
@@ -76,7 +75,7 @@ public class CoordinationState {
  private VotingConfiguration lastPublishedConfiguration;
  private VoteCollection publishVotes;
 
- public CoordinationState(DiscoveryNode localNode, PersistedState persistedState, ElectionStrategy electionStrategy, PersistedState remotePersistedState) {
+ public CoordinationState(DiscoveryNode localNode, PersistedState persistedState, ElectionStrategy electionStrategy) {
  this.localNode = localNode;
 
  // persisted state
@@ -90,7 +89,6 @@ public CoordinationState(DiscoveryNode localNode, PersistedState persistedState,
  this.lastPublishedVersion = 0L;
  this.lastPublishedConfiguration = persistedState.getLastAcceptedState().getLastAcceptedConfiguration();
  this.publishVotes = new VoteCollection();
- this.remotePersistedState = remotePersistedState;
  }
 
  public long getCurrentTerm() {

server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java

@@ -45,7 +45,6 @@
 import org.opensearch.cluster.coordination.ClusterFormationFailureHelper.ClusterFormationState;
 import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfigExclusion;
 import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration;
-import org.opensearch.cluster.coordination.CoordinationState.PersistedState;
 import org.opensearch.cluster.coordination.CoordinationState.VoteCollection;
 import org.opensearch.cluster.coordination.FollowersChecker.FollowerCheckRequest;
 import org.opensearch.cluster.coordination.JoinHelper.InitialJoinAccumulator;
@@ -182,7 +181,6 @@ public class Coordinator extends AbstractLifecycleComponent implements Discovery
  private JoinHelper.JoinAccumulator joinAccumulator;
  private Optional<CoordinatorPublication> currentPublication = Optional.empty();
  private final NodeHealthService nodeHealthService;
- private final Supplier<CoordinationState.PersistedState> remotePersistedStateSupplier;
 
  /**
  * @param nodeName The name of the node, used to name the {@link java.util.concurrent.ExecutorService} of the {@link SeedHostsResolver}.
@@ -203,8 +201,7 @@ public Coordinator(
  Random random,
  RerouteService rerouteService,
  ElectionStrategy electionStrategy,
- NodeHealthService nodeHealthService,
- Supplier<CoordinationState.PersistedState> remotePersistedStateSupplier
+ NodeHealthService nodeHealthService
  ) {
  this.settings = settings;
  this.transportService = transportService;
@@ -289,7 +286,6 @@ public Coordinator(
  joinHelper::logLastFailedJoinAttempt
  );
  this.nodeHealthService = nodeHealthService;
- this.remotePersistedStateSupplier = remotePersistedStateSupplier;
  this.localNodeCommissioned = true;
  }
 
@@ -825,7 +821,7 @@ boolean publicationInProgress() {
  protected void doStart() {
  synchronized (mutex) {
  CoordinationState.PersistedState persistedState = persistedStateSupplier.get();
- coordinationState.set(new CoordinationState(getLocalNode(), persistedState, electionStrategy, remotePersistedStateSupplier.get()));
+ coordinationState.set(new CoordinationState(getLocalNode(), persistedState, electionStrategy));
  peerFinder.setCurrentTerm(getCurrentTerm());
  configuredHostsResolver.start();
  final ClusterState lastAcceptedState = coordinationState.get().getLastAcceptedState();
@@ -1312,10 +1308,6 @@ assert getLocalNode().equals(clusterState.getNodes().get(getLocalNode().getId())
  leaderChecker.setCurrentNodes(publishNodes);
  followersChecker.setCurrentNodes(publishNodes);
  lagDetector.setTrackedNodes(publishNodes);
-
- PersistedState remotePersistedState = remotePersistedStateSupplier.get();
- assert remotePersistedState != null : "Remote state has not been initialized";
- remotePersistedState.setLastAcceptedState(clusterState);
  publication.start(followersChecker.getFaultyNodes());
  }
  } catch (Exception e) {