This class acts as an indirection which makes following logic hard, eliminate
it in favor of explicit code.
Change-Id: I8715f6cdaed6e653d39af6741242072b39232022
Signed-off-by: Robert Varga <rovarga@cisco.com>
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.opendaylight.controller.cluster.DataPersistenceProvider;
import javax.annotation.Nonnull;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.opendaylight.controller.cluster.DataPersistenceProvider;
private final BehaviorStateHolder reusableBehaviorStateHolder = new BehaviorStateHolder();
private final BehaviorStateHolder reusableBehaviorStateHolder = new BehaviorStateHolder();
- private final SwitchBehaviorSupplier reusableSwitchBehaviorSupplier = new SwitchBehaviorSupplier();
-
private RaftActorServerConfigurationSupport serverConfigurationSupport;
private RaftActorLeadershipTransferCohort leadershipTransferInProgress;
private RaftActorServerConfigurationSupport serverConfigurationSupport;
private RaftActorLeadershipTransferCohort leadershipTransferInProgress;
- protected void changeCurrentBehavior(RaftActorBehavior newBehavior){
- if(getCurrentBehavior() != null) {
+ protected void changeCurrentBehavior(RaftActorBehavior newBehavior) {
+ final RaftActorBehavior currentBehavior = getCurrentBehavior();
+ if (currentBehavior != null) {
- getCurrentBehavior().close();
- } catch(Exception e) {
- LOG.warn("{}: Error closing behavior {}", persistence(), getCurrentBehavior(), e);
+ currentBehavior.close();
+ } catch (Exception e) {
+ LOG.warn("{}: Error closing behavior {}", persistence(), currentBehavior, e);
- reusableBehaviorStateHolder.init(getCurrentBehavior());
+ reusableBehaviorStateHolder.init(currentBehavior);
setCurrentBehavior(newBehavior);
setCurrentBehavior(newBehavior);
- handleBehaviorChange(reusableBehaviorStateHolder, getCurrentBehavior());
+ handleBehaviorChange(reusableBehaviorStateHolder, newBehavior);
} else if(message instanceof Runnable) {
((Runnable)message).run();
} else {
} else if(message instanceof Runnable) {
((Runnable)message).run();
} else {
- switchBehavior(reusableSwitchBehaviorSupplier.handleMessage(getSender(), message));
+ final RaftActorBehavior currentBehavior = getCurrentBehavior();
+
+ // Processing the message may affect the state, hence we need to capture it
+ reusableBehaviorStateHolder.init(currentBehavior);
+ final RaftActorBehavior nextBehavior = currentBehavior.handleMessage(getSender(), message);
+ switchBehavior(nextBehavior);
if(!getRaftActorContext().getRaftPolicy().automaticElectionsEnabled()) {
RaftState newState = message.getNewState();
if( newState == RaftState.Leader || newState == RaftState.Follower) {
if(!getRaftActorContext().getRaftPolicy().automaticElectionsEnabled()) {
RaftState newState = message.getNewState();
if( newState == RaftState.Leader || newState == RaftState.Follower) {
- switchBehavior(reusableSwitchBehaviorSupplier.handleMessage(getSender(), message));
+ reusableBehaviorStateHolder.init(getCurrentBehavior());
+ final RaftActorBehavior nextBehavior = AbstractRaftActorBehavior.createBehavior(context,
+ message.getNewState());
+ switchBehavior(nextBehavior);
getRaftActorContext().getTermInformation().updateAndPersist(message.getNewTerm(), "");
} else {
LOG.warn("Switching to behavior : {} - not supported", newState);
getRaftActorContext().getTermInformation().updateAndPersist(message.getNewTerm(), "");
} else {
LOG.warn("Switching to behavior : {} - not supported", newState);
- private void switchBehavior(Supplier<RaftActorBehavior> supplier){
- reusableBehaviorStateHolder.init(getCurrentBehavior());
-
- setCurrentBehavior(supplier.get());
-
- handleBehaviorChange(reusableBehaviorStateHolder, getCurrentBehavior());
+ private void switchBehavior(final RaftActorBehavior nextBehavior) {
+ setCurrentBehavior(nextBehavior);
+ handleBehaviorChange(reusableBehaviorStateHolder, nextBehavior);
return leaderPayloadVersion;
}
}
return leaderPayloadVersion;
}
}
-
- private class SwitchBehaviorSupplier implements Supplier<RaftActorBehavior> {
- private Object message;
- private ActorRef sender;
-
- public SwitchBehaviorSupplier handleMessage(ActorRef sender, Object message){
- this.sender = sender;
- this.message = message;
- return this;
- }
-
- @Override
- public RaftActorBehavior get() {
- if(this.message instanceof SwitchBehavior){
- return AbstractRaftActorBehavior.createBehavior(context, ((SwitchBehavior) message).getNewState());
- }
- return getCurrentBehavior().handleMessage(sender, message);
- }
- }