X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FRaftActorContextImpl.java;h=66059b5d62c1b756517cb691ab53f938b42006b0;hp=684845c27023185da3ad386771bcba6381b302d0;hb=cc2566a2570ce97c5ec054fca77f380ca35b942d;hpb=c58a4036d120482ce18f247bb1b283193cab60d1 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 684845c270..66059b5d62 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 @@ -8,22 +8,31 @@ package org.opendaylight.controller.cluster.raft; -import static com.google.common.base.Preconditions.checkState; +import akka.actor.ActorContext; import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.actor.ActorSystem; import akka.actor.Props; -import akka.actor.UntypedActorContext; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Supplier; +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 org.opendaylight.controller.cluster.DataPersistenceProvider; +import org.opendaylight.controller.cluster.raft.policy.RaftPolicy; +import org.opendaylight.controller.cluster.raft.ServerConfigurationPayload.ServerInfo; import org.slf4j.Logger; public class RaftActorContextImpl implements RaftActorContext { private final ActorRef actor; - private final UntypedActorContext context; + private final ActorContext context; private final String id; @@ -35,12 +44,14 @@ public class RaftActorContextImpl implements RaftActorContext { private ReplicatedLog replicatedLog; - private final Map peerAddresses; + private final Map peerInfoMap = new HashMap<>(); private final Logger LOG; private ConfigParams configParams; + private boolean dynamicServerConfiguration = false; + @VisibleForTesting private Supplier totalMemoryRetriever; @@ -48,21 +59,38 @@ public class RaftActorContextImpl implements RaftActorContext { // be passed to it in the constructor private SnapshotManager snapshotManager; - public RaftActorContextImpl(ActorRef actor, UntypedActorContext context, String id, + private final DataPersistenceProvider persistenceProvider; + + private short payloadVersion; + + public RaftActorContextImpl(ActorRef actor, ActorContext context, String id, ElectionTerm termInformation, long commitIndex, long lastApplied, Map peerAddresses, - ConfigParams configParams, Logger logger) { + ConfigParams configParams, DataPersistenceProvider persistenceProvider, Logger logger) { this.actor = actor; this.context = context; this.id = id; this.termInformation = termInformation; this.commitIndex = commitIndex; this.lastApplied = lastApplied; - this.peerAddresses = peerAddresses; this.configParams = configParams; + this.persistenceProvider = persistenceProvider; this.LOG = logger; + + for(Map.Entry e: peerAddresses.entrySet()) { + peerInfoMap.put(e.getKey(), new PeerInfo(e.getKey(), e.getValue(), VotingState.VOTING)); + } + } + + public void setPayloadVersion(short payloadVersion) { + this.payloadVersion = payloadVersion; + } + + @Override + public short getPayloadVersion() { + return payloadVersion; } - void setConfigParams(ConfigParams configParams) { + public void setConfigParams(ConfigParams configParams) { this.configParams = configParams; } @@ -105,15 +133,18 @@ public class RaftActorContextImpl implements RaftActorContext { return lastApplied; } - @Override public void setLastApplied(long lastApplied) { + @Override + public void setLastApplied(long lastApplied) { this.lastApplied = lastApplied; } - @Override public void setReplicatedLog(ReplicatedLog replicatedLog) { + @Override + public void setReplicatedLog(ReplicatedLog replicatedLog) { this.replicatedLog = replicatedLog; } - @Override public ReplicatedLog getReplicatedLog() { + @Override + public ReplicatedLog getReplicatedLog() { return replicatedLog; } @@ -125,24 +156,69 @@ public class RaftActorContextImpl implements RaftActorContext { return this.LOG; } - @Override public Map getPeerAddresses() { - return peerAddresses; + @Override + public Collection getPeerIds() { + return peerInfoMap.keySet(); } - @Override public String getPeerAddress(String peerId) { - return peerAddresses.get(peerId); + @Override + public Collection getPeers() { + return peerInfoMap.values(); + } + + @Override + public PeerInfo getPeerInfo(String peerId) { + return peerInfoMap.get(peerId); + } + + @Override + public String getPeerAddress(String peerId) { + String peerAddress = null; + PeerInfo peerInfo = peerInfoMap.get(peerId); + if(peerInfo != null) { + peerAddress = peerInfo.getAddress(); + if(peerAddress == null) { + peerAddress = configParams.getPeerAddressResolver().resolve(peerId); + peerInfo.setAddress(peerAddress); + } + } + + return peerAddress; + } + + @Override + public void updatePeerIds(ServerConfigurationPayload serverConfig){ + + Set currentPeers = new HashSet<>(this.getPeerIds()); + for(ServerInfo server: serverConfig.getServerConfig()) { + if(!getId().equals(server.getId())) { + 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); + } + setDynamicServerConfigurationInUse(); } @Override public ConfigParams getConfigParams() { return configParams; } - @Override public void addToPeers(String name, String address) { - peerAddresses.put(name, address); + @Override + public void addToPeers(String id, String address, VotingState votingState) { + peerInfoMap.put(id, new PeerInfo(id, address, votingState)); } @Override public void removePeer(String name) { - peerAddresses.remove(name); + peerInfoMap.remove(name); } @Override public ActorSelection getPeerActorSelection(String peerId) { @@ -153,11 +229,13 @@ public class RaftActorContextImpl implements RaftActorContext { return null; } - @Override public void setPeerAddress(String peerId, String peerAddress) { - LOG.info("Peer address for peer {} set to {}", peerId, peerAddress); - checkState(peerAddresses.containsKey(peerId), peerId + " is unknown"); - - peerAddresses.put(peerId, peerAddress); + @Override + public void setPeerAddress(String peerId, String peerAddress) { + PeerInfo peerInfo = peerInfoMap.get(peerId); + if(peerInfo != null) { + LOG.info("Peer address for peer {} set to {}", peerId, peerAddress); + peerInfo.setAddress(peerAddress); + } } @Override @@ -180,6 +258,42 @@ public class RaftActorContextImpl implements RaftActorContext { @Override public boolean hasFollowers() { - return getPeerAddresses().keySet().size() > 0; + return getPeerIds().size() > 0; + } + + @Override + public DataPersistenceProvider getPersistenceProvider() { + return persistenceProvider; + } + + + @Override + public RaftPolicy getRaftPolicy() { + return configParams.getRaftPolicy(); + } + + @Override + public boolean isDynamicServerConfigurationInUse() { + return dynamicServerConfiguration; + } + + @Override + public void setDynamicServerConfigurationInUse() { + this.dynamicServerConfiguration = true; + } + + @Override + public ServerConfigurationPayload getPeerServerInfo() { + 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())); + } + + newConfig.add(new ServerInfo(getId(), true)); + return (new ServerConfigurationPayload(newConfig)); } }