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=8ba0f48d72e9ca8c5825f657bdc5ec9940365c17;hb=HEAD;hp=b307195a7ae038a976beae15997376a30a4f590f;hpb=d796a8de8b208ca24bb57aebfc689f8be8bc2c7b;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 b307195a7a..a27bb9c395 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 @@ -5,9 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.raft; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorContext; import akka.actor.ActorRef; import akka.actor.ActorSelection; @@ -15,20 +16,18 @@ import akka.actor.ActorSystem; import akka.actor.Props; import akka.cluster.Cluster; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import java.util.ArrayList; +import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Set; +import java.util.concurrent.Executor; import java.util.function.Consumer; import java.util.function.LongSupplier; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.cluster.DataPersistenceProvider; -import org.opendaylight.controller.cluster.io.FileBackedOutputStream; +import org.opendaylight.controller.cluster.io.FileBackedOutputStreamFactory; import org.opendaylight.controller.cluster.raft.base.messages.ApplyState; import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; import org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPayload; @@ -49,6 +48,8 @@ public class RaftActorContextImpl implements RaftActorContext { private final ActorContext context; + private final @NonNull Executor executor; + private final String id; private final ElectionTerm termInformation; @@ -88,29 +89,38 @@ public class RaftActorContextImpl implements RaftActorContext { private final Consumer applyStateConsumer; - public RaftActorContextImpl(ActorRef actor, ActorContext context, String id, - @Nonnull ElectionTerm termInformation, long commitIndex, long lastApplied, - @Nonnull Map peerAddresses, - @Nonnull ConfigParams configParams, @Nonnull DataPersistenceProvider persistenceProvider, - @Nonnull Consumer applyStateConsumer, @Nonnull Logger logger) { + private final FileBackedOutputStreamFactory fileBackedOutputStreamFactory; + + private RaftActorLeadershipTransferCohort leadershipTransferCohort; + + public RaftActorContextImpl(final ActorRef actor, final ActorContext context, final String id, + final @NonNull ElectionTerm termInformation, final long commitIndex, final long lastApplied, + final @NonNull Map peerAddresses, + final @NonNull ConfigParams configParams, final @NonNull DataPersistenceProvider persistenceProvider, + final @NonNull Consumer applyStateConsumer, final @NonNull Logger logger, + final @NonNull Executor executor) { this.actor = actor; this.context = context; this.id = id; - this.termInformation = Preconditions.checkNotNull(termInformation); + this.termInformation = requireNonNull(termInformation); + this.executor = requireNonNull(executor); this.commitIndex = commitIndex; this.lastApplied = lastApplied; - this.configParams = Preconditions.checkNotNull(configParams); - this.persistenceProvider = Preconditions.checkNotNull(persistenceProvider); - this.log = Preconditions.checkNotNull(logger); - this.applyStateConsumer = Preconditions.checkNotNull(applyStateConsumer); + this.configParams = requireNonNull(configParams); + this.persistenceProvider = requireNonNull(persistenceProvider); + log = requireNonNull(logger); + this.applyStateConsumer = requireNonNull(applyStateConsumer); + + fileBackedOutputStreamFactory = new FileBackedOutputStreamFactory( + configParams.getFileBackedStreamingThreshold(), configParams.getTempFileDirectory()); - for (Map.Entry e: Preconditions.checkNotNull(peerAddresses).entrySet()) { + for (Map.Entry e : requireNonNull(peerAddresses).entrySet()) { peerInfoMap.put(e.getKey(), new PeerInfo(e.getKey(), e.getValue(), VotingState.VOTING)); } } @VisibleForTesting - public void setPayloadVersion(short payloadVersion) { + public void setPayloadVersion(final short payloadVersion) { this.payloadVersion = payloadVersion; } @@ -119,17 +129,17 @@ public class RaftActorContextImpl implements RaftActorContext { return payloadVersion; } - public void setConfigParams(ConfigParams configParams) { + public void setConfigParams(final ConfigParams configParams) { this.configParams = configParams; } @Override - public ActorRef actorOf(Props props) { + public ActorRef actorOf(final Props props) { return context.actorOf(props); } @Override - public ActorSelection actorSelection(String path) { + public ActorSelection actorSelection(final String path) { return context.actorSelection(path); } @@ -143,6 +153,11 @@ public class RaftActorContextImpl implements RaftActorContext { return actor; } + @Override + public final Executor getExecutor() { + return executor; + } + @Override @SuppressWarnings("checkstyle:IllegalCatch") public Optional getCluster() { @@ -151,7 +166,7 @@ public class RaftActorContextImpl implements RaftActorContext { cluster = Optional.of(Cluster.get(getActorSystem())); } catch (Exception e) { // An exception means there's no cluster configured. This will only happen in unit tests. - log.debug("{}: Could not obtain Cluster: {}", getId(), e); + log.debug("{}: Could not obtain Cluster", getId(), e); cluster = Optional.empty(); } } @@ -169,7 +184,7 @@ public class RaftActorContextImpl implements RaftActorContext { return commitIndex; } - @Override public void setCommitIndex(long commitIndex) { + @Override public void setCommitIndex(final long commitIndex) { this.commitIndex = commitIndex; } @@ -179,12 +194,14 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public void setLastApplied(long lastApplied) { + public void setLastApplied(final long lastApplied) { + final Throwable stackTrace = log.isTraceEnabled() ? new Throwable() : null; + log.debug("{}: Moving last applied index from {} to {}", id, this.lastApplied, lastApplied, stackTrace); this.lastApplied = lastApplied; } @Override - public void setReplicatedLog(ReplicatedLog replicatedLog) { + public void setReplicatedLog(final ReplicatedLog replicatedLog) { this.replicatedLog = replicatedLog; } @@ -193,12 +210,14 @@ public class RaftActorContextImpl implements RaftActorContext { return replicatedLog; } - @Override public ActorSystem getActorSystem() { + @Override + public ActorSystem getActorSystem() { return context.system(); } - @Override public Logger getLogger() { - return this.log; + @Override + public Logger getLogger() { + return log; } @Override @@ -212,12 +231,12 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public PeerInfo getPeerInfo(String peerId) { + public PeerInfo getPeerInfo(final String peerId) { return peerInfoMap.get(peerId); } @Override - public String getPeerAddress(String peerId) { + public String getPeerAddress(final String peerId) { String peerAddress; PeerInfo peerInfo = peerInfoMap.get(peerId); if (peerInfo != null) { @@ -234,35 +253,28 @@ public class RaftActorContextImpl implements RaftActorContext { } @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; - } + public void updatePeerIds(final ServerConfigurationPayload serverConfig) { + boolean newVotingMember = false; + var currentPeers = new HashSet<>(getPeerIds()); + for (var server : serverConfig.getServerConfig()) { + if (getId().equals(server.peerId())) { + newVotingMember = server.isVoting(); } else { - VotingState votingState = server.isVoting() ? VotingState.VOTING : VotingState.NON_VOTING; - if (!currentPeers.contains(server.getId())) { - this.addToPeers(server.getId(), null, votingState); + final var votingState = server.isVoting() ? VotingState.VOTING : VotingState.NON_VOTING; + if (currentPeers.contains(server.peerId())) { + getPeerInfo(server.peerId()).setVotingState(votingState); + currentPeers.remove(server.peerId()); } else { - this.getPeerInfo(server.getId()).setVotingState(votingState); - currentPeers.remove(server.getId()); + addToPeers(server.peerId(), null, votingState); } } } for (String peerIdToRemove : currentPeers) { - this.removePeer(peerIdToRemove); - } - - if (!foundSelf) { - votingMember = false; + removePeer(peerIdToRemove); } + votingMember = newVotingMember; log.debug("{}: Updated server config: isVoting: {}, peers: {}", id, votingMember, peerInfoMap.values()); setDynamicServerConfigurationInUse(); @@ -273,13 +285,13 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public void addToPeers(String peerId, String address, VotingState votingState) { + public void addToPeers(final String peerId, final String address, final VotingState votingState) { peerInfoMap.put(peerId, new PeerInfo(peerId, address, votingState)); numVotingPeers = -1; } @Override - public void removePeer(String name) { + public void removePeer(final String name) { if (getId().equals(name)) { votingMember = false; } else { @@ -288,7 +300,7 @@ public class RaftActorContextImpl implements RaftActorContext { } } - @Override public ActorSelection getPeerActorSelection(String peerId) { + @Override public ActorSelection getPeerActorSelection(final String peerId) { String peerAddress = getPeerAddress(peerId); if (peerAddress != null) { return actorSelection(peerAddress); @@ -297,7 +309,7 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public void setPeerAddress(String peerId, String peerAddress) { + public void setPeerAddress(final String peerId, final String peerAddress) { PeerInfo peerInfo = peerInfoMap.get(peerId); if (peerInfo != null) { log.info("Peer address for peer {} set to {}", peerId, peerAddress); @@ -319,7 +331,7 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public void setTotalMemoryRetriever(LongSupplier retriever) { + public void setTotalMemoryRetriever(final LongSupplier retriever) { totalMemoryRetriever = retriever == null ? JVM_MEMORY_RETRIEVER : retriever; } @@ -346,17 +358,17 @@ public class RaftActorContextImpl implements RaftActorContext { @Override public void setDynamicServerConfigurationInUse() { - this.dynamicServerConfiguration = true; + dynamicServerConfiguration = true; } @Override - public ServerConfigurationPayload getPeerServerInfo(boolean includeSelf) { + public ServerConfigurationPayload getPeerServerInfo(final boolean includeSelf) { if (!isDynamicServerConfigurationInUse()) { return null; } - Collection peers = getPeers(); - List newConfig = new ArrayList<>(peers.size() + 1); - for (PeerInfo peer: peers) { + final var peers = getPeers(); + final var newConfig = ImmutableList.builderWithExpectedSize(peers.size() + (includeSelf ? 1 : 0)); + for (PeerInfo peer : peers) { newConfig.add(new ServerInfo(peer.getId(), peer.isVoting())); } @@ -364,7 +376,7 @@ public class RaftActorContextImpl implements RaftActorContext { newConfig.add(new ServerInfo(getId(), votingMember)); } - return new ServerConfigurationPayload(newConfig); + return new ServerConfigurationPayload(newConfig.build()); } @Override @@ -392,7 +404,7 @@ public class RaftActorContextImpl implements RaftActorContext { } void setCurrentBehavior(final RaftActorBehavior behavior) { - this.currentBehavior = Preconditions.checkNotNull(behavior); + currentBehavior = requireNonNull(behavior); } @Override @@ -401,9 +413,8 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public FileBackedOutputStream newFileBackedOutputStream() { - return new FileBackedOutputStream(configParams.getFileBackedStreamingThreshold(), - configParams.getTempFileDirectory()); + public FileBackedOutputStreamFactory getFileBackedOutputStreamFactory() { + return fileBackedOutputStreamFactory; } @SuppressWarnings("checkstyle:IllegalCatch") @@ -416,4 +427,15 @@ public class RaftActorContextImpl implements RaftActorContext { } } } + + @Override + public RaftActorLeadershipTransferCohort getRaftActorLeadershipTransferCohort() { + return leadershipTransferCohort; + } + + @Override + @SuppressWarnings("checkstyle:hiddenField") + public void setRaftActorLeadershipTransferCohort(final RaftActorLeadershipTransferCohort leadershipTransferCohort) { + this.leadershipTransferCohort = leadershipTransferCohort; + } }