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=b86a015f6929aa9acc6eb7c0b152fede241e250a;hp=eb059d60fbee1c89d6a309e5cfaedbf5bc608c64;hb=ac5bcae15c3c9831f2879ae44c66b39130e3f2fe;hpb=cbf0c2ef5f3fb7ea6367ac98f580337840952a05 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 eb059d60fb..b86a015f69 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,20 +8,26 @@ 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.Collection; +import java.util.HashMap; import java.util.Map; +import org.opendaylight.controller.cluster.DataPersistenceProvider; +import org.opendaylight.controller.cluster.raft.policy.RaftPolicy; 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; @@ -33,37 +39,51 @@ 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 snapshotCaptureInitiated; + @VisibleForTesting + private Supplier totalMemoryRetriever; // Snapshot manager will need to be created on demand as it needs raft actor context which cannot // be passed to it in the constructor private SnapshotManager snapshotManager; - public RaftActorContextImpl(ActorRef actor, UntypedActorContext context, - String id, - ElectionTerm termInformation, long commitIndex, - long lastApplied, ReplicatedLog replicatedLog, - Map peerAddresses, ConfigParams configParams, - Logger logger) { + 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, DataPersistenceProvider persistenceProvider, Logger logger) { this.actor = actor; this.context = context; this.id = id; this.termInformation = termInformation; this.commitIndex = commitIndex; this.lastApplied = lastApplied; - this.replicatedLog = replicatedLog; - 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)); + } } - void setConfigParams(ConfigParams configParams) { + public void setPayloadVersion(short payloadVersion) { + this.payloadVersion = payloadVersion; + } + + @Override + public short getPayloadVersion() { + return payloadVersion; + } + + public void setConfigParams(ConfigParams configParams) { this.configParams = configParams; } @@ -106,15 +126,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; } @@ -126,24 +149,47 @@ 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 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) { @@ -154,17 +200,46 @@ 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 public SnapshotManager getSnapshotManager() { if(snapshotManager == null){ snapshotManager = new SnapshotManager(this, LOG); } return snapshotManager; } + + @Override + public long getTotalMemory() { + return totalMemoryRetriever != null ? totalMemoryRetriever.get() : Runtime.getRuntime().totalMemory(); + } + + @Override + public void setTotalMemoryRetriever(Supplier retriever) { + totalMemoryRetriever = retriever; + } + + @Override + public boolean hasFollowers() { + return getPeerIds().size() > 0; + } + + @Override + public DataPersistenceProvider getPersistenceProvider() { + return persistenceProvider; + } + + + @Override + public RaftPolicy getRaftPolicy() { + return configParams.getRaftPolicy(); + } }