X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FRaftActorContextImpl.java;h=d0deb7101a2f05529539d09107bc3c9ee52a9d49;hb=3676d1686706dbee6656e86a23c4bdb516d5267b;hp=bbeaddb240c2ab9bb220178c04c9627c3826bd94;hpb=9491b06df9419e58db3089a4c5cd9f5407cb9aac;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java index bbeaddb240..d0deb7101a 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java @@ -13,13 +13,19 @@ import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.actor.ActorSystem; import akka.actor.Props; - import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Supplier; +import com.google.common.base.Preconditions; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; import org.opendaylight.controller.cluster.DataPersistenceProvider; +import org.opendaylight.controller.cluster.raft.ServerConfigurationPayload.ServerInfo; +import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; import org.opendaylight.controller.cluster.raft.policy.RaftPolicy; import org.slf4j.Logger; @@ -45,6 +51,8 @@ public class RaftActorContextImpl implements RaftActorContext { private ConfigParams configParams; + private boolean dynamicServerConfiguration = false; + @VisibleForTesting private Supplier totalMemoryRetriever; @@ -56,6 +64,10 @@ public class RaftActorContextImpl implements RaftActorContext { private short payloadVersion; + private boolean votingMember = true; + + private RaftActorBehavior currentBehavior; + public RaftActorContextImpl(ActorRef actor, ActorContext context, String id, ElectionTerm termInformation, long commitIndex, long lastApplied, Map peerAddresses, ConfigParams configParams, DataPersistenceProvider persistenceProvider, Logger logger) { @@ -74,7 +86,7 @@ public class RaftActorContextImpl implements RaftActorContext { } } - void setPayloadVersion(short payloadVersion) { + public void setPayloadVersion(short payloadVersion) { this.payloadVersion = payloadVersion; } @@ -83,7 +95,7 @@ public class RaftActorContextImpl implements RaftActorContext { return payloadVersion; } - void setConfigParams(ConfigParams configParams) { + public void setConfigParams(ConfigParams configParams) { this.configParams = configParams; } @@ -174,11 +186,46 @@ public class RaftActorContextImpl implements RaftActorContext { peerAddress = configParams.getPeerAddressResolver().resolve(peerId); peerInfo.setAddress(peerAddress); } + } else { + peerAddress = configParams.getPeerAddressResolver().resolve(peerId); } return peerAddress; } + @Override + public void updatePeerIds(ServerConfigurationPayload serverConfig){ + votingMember = true; + boolean foundSelf = false; + Set currentPeers = new HashSet<>(this.getPeerIds()); + for(ServerInfo server: serverConfig.getServerConfig()) { + if(getId().equals(server.getId())) { + foundSelf = true; + if(!server.isVoting()) { + votingMember = false; + } + } else { + VotingState votingState = server.isVoting() ? VotingState.VOTING: VotingState.NON_VOTING; + if(!currentPeers.contains(server.getId())) { + this.addToPeers(server.getId(), null, votingState); + } else { + this.getPeerInfo(server.getId()).setVotingState(votingState); + currentPeers.remove(server.getId()); + } + } + } + + for(String peerIdToRemove: currentPeers) { + this.removePeer(peerIdToRemove); + } + + if(!foundSelf) { + votingMember = false; + } + + setDynamicServerConfigurationInUse(); + } + @Override public ConfigParams getConfigParams() { return configParams; } @@ -188,8 +235,13 @@ public class RaftActorContextImpl implements RaftActorContext { peerInfoMap.put(id, new PeerInfo(id, address, votingState)); } - @Override public void removePeer(String name) { - peerInfoMap.remove(name); + @Override + public void removePeer(String name) { + if(getId().equals(name)) { + votingMember = false; + } else { + peerInfoMap.remove(name); + } } @Override public ActorSelection getPeerActorSelection(String peerId) { @@ -242,4 +294,56 @@ public class RaftActorContextImpl implements RaftActorContext { public RaftPolicy getRaftPolicy() { return configParams.getRaftPolicy(); } + + @Override + public boolean isDynamicServerConfigurationInUse() { + return dynamicServerConfiguration; + } + + @Override + public void setDynamicServerConfigurationInUse() { + this.dynamicServerConfiguration = true; + } + + @Override + public ServerConfigurationPayload getPeerServerInfo(boolean includeSelf) { + if (!isDynamicServerConfigurationInUse()) { + return null; + } + Collection peers = getPeers(); + List newConfig = new ArrayList<>(peers.size() + 1); + for(PeerInfo peer: peers) { + newConfig.add(new ServerInfo(peer.getId(), peer.isVoting())); + } + + if(includeSelf) { + newConfig.add(new ServerInfo(getId(), votingMember)); + } + + return (new ServerConfigurationPayload(newConfig)); + } + + @Override + public boolean isVotingMember() { + return votingMember; + } + + @Override + public RaftActorBehavior getCurrentBehavior() { + return currentBehavior; + } + + void setCurrentBehavior(final RaftActorBehavior behavior) { + this.currentBehavior = Preconditions.checkNotNull(behavior); + } + + void close() { + if (currentBehavior != null) { + try { + currentBehavior.close(); + } catch (Exception e) { + LOG.debug("{}: Error closing behavior {}", getId(), currentBehavior.state()); + } + } + } }