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=8ba0f48d72e9ca8c5825f657bdc5ec9940365c17;hp=4644a2d79807bf36d069fa010ce561e0232cbcf9;hb=refs%2Fchanges%2F09%2F83009%2F6;hpb=866cdf141262dd7b57e95b3e3aa75709b7d0c586 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 4644a2d798..8ba0f48d72 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,7 +16,6 @@ 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 java.util.Collection; import java.util.HashMap; @@ -24,10 +24,10 @@ 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 javax.annotation.Nullable; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.cluster.DataPersistenceProvider; import org.opendaylight.controller.cluster.io.FileBackedOutputStreamFactory; import org.opendaylight.controller.cluster.raft.base.messages.ApplyState; @@ -50,6 +50,8 @@ public class RaftActorContextImpl implements RaftActorContext { private final ActorContext context; + private final @NonNull Executor executor; + private final String id; private final ElectionTerm termInformation; @@ -93,32 +95,34 @@ public class RaftActorContextImpl implements RaftActorContext { private RaftActorLeadershipTransferCohort leadershipTransferCohort; - 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) { + 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); + this.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; } @@ -127,17 +131,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); } @@ -151,6 +155,11 @@ public class RaftActorContextImpl implements RaftActorContext { return actor; } + @Override + public final Executor getExecutor() { + return executor; + } + @Override @SuppressWarnings("checkstyle:IllegalCatch") public Optional getCluster() { @@ -159,7 +168,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(); } } @@ -177,7 +186,7 @@ public class RaftActorContextImpl implements RaftActorContext { return commitIndex; } - @Override public void setCommitIndex(long commitIndex) { + @Override public void setCommitIndex(final long commitIndex) { this.commitIndex = commitIndex; } @@ -187,13 +196,14 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public void setLastApplied(long lastApplied) { - log.debug("{}: Moving last applied index from {} to {}", id, this.lastApplied, 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; } @@ -202,11 +212,13 @@ public class RaftActorContextImpl implements RaftActorContext { return replicatedLog; } - @Override public ActorSystem getActorSystem() { + @Override + public ActorSystem getActorSystem() { return context.system(); } - @Override public Logger getLogger() { + @Override + public Logger getLogger() { return this.log; } @@ -221,12 +233,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) { @@ -243,7 +255,7 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public void updatePeerIds(ServerConfigurationPayload serverConfig) { + public void updatePeerIds(final ServerConfigurationPayload serverConfig) { votingMember = true; boolean foundSelf = false; Set currentPeers = new HashSet<>(this.getPeerIds()); @@ -282,13 +294,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 { @@ -297,7 +309,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); @@ -306,7 +318,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); @@ -328,7 +340,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; } @@ -359,7 +371,7 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - public ServerConfigurationPayload getPeerServerInfo(boolean includeSelf) { + public ServerConfigurationPayload getPeerServerInfo(final boolean includeSelf) { if (!isDynamicServerConfigurationInUse()) { return null; } @@ -401,7 +413,7 @@ public class RaftActorContextImpl implements RaftActorContext { } void setCurrentBehavior(final RaftActorBehavior behavior) { - this.currentBehavior = Preconditions.checkNotNull(behavior); + this.currentBehavior = requireNonNull(behavior); } @Override @@ -426,14 +438,13 @@ public class RaftActorContextImpl implements RaftActorContext { } @Override - @Nullable public RaftActorLeadershipTransferCohort getRaftActorLeadershipTransferCohort() { return leadershipTransferCohort; } @Override - public void setRaftActorLeadershipTransferCohort( - @Nullable RaftActorLeadershipTransferCohort leadershipTransferCohort) { + @SuppressWarnings("checkstyle:hiddenField") + public void setRaftActorLeadershipTransferCohort(final RaftActorLeadershipTransferCohort leadershipTransferCohort) { this.leadershipTransferCohort = leadershipTransferCohort; } }