onStateChanged();
}
+ String lastLeaderId = oldBehavior == null ? null : oldBehaviorState.getLastLeaderId();
String lastValidLeaderId = oldBehavior == null ? null : oldBehaviorState.getLastValidLeaderId();
String oldBehaviorStateName = oldBehavior == null ? null : oldBehavior.state().name();
// it can happen that the state has not changed but the leader has changed.
Optional<ActorRef> roleChangeNotifier = getRoleChangeNotifier();
- if(!Objects.equals(lastValidLeaderId, currentBehavior.getLeaderId()) ||
+ if(!Objects.equals(lastLeaderId, currentBehavior.getLeaderId()) ||
oldBehaviorState.getLeaderPayloadVersion() != currentBehavior.getLeaderPayloadVersion()) {
if(roleChangeNotifier.isPresent()) {
roleChangeNotifier.get().tell(newLeaderStateChanged(getId(), currentBehavior.getLeaderId(),
private static abstract class BehaviorState implements Immutable {
@Nullable abstract RaftActorBehavior getBehavior();
@Nullable abstract String getLastValidLeaderId();
+ @Nullable abstract String getLastLeaderId();
@Nullable abstract short getLeaderPayloadVersion();
}
private static final class SimpleBehaviorState extends BehaviorState {
private final RaftActorBehavior behavior;
private final String lastValidLeaderId;
+ private final String lastLeaderId;
private final short leaderPayloadVersion;
- SimpleBehaviorState(final String lastValidLeaderId, final RaftActorBehavior behavior) {
+ SimpleBehaviorState(final String lastValidLeaderId, final String lastLeaderId,
+ final RaftActorBehavior behavior) {
this.lastValidLeaderId = lastValidLeaderId;
+ this.lastLeaderId = lastLeaderId;
this.behavior = Preconditions.checkNotNull(behavior);
this.leaderPayloadVersion = behavior.getLeaderPayloadVersion();
}
short getLeaderPayloadVersion() {
return leaderPayloadVersion;
}
+
+ @Override
+ String getLastLeaderId() {
+ return lastLeaderId;
+ }
}
/**
short getLeaderPayloadVersion() {
return -1;
}
+
+ @Override
+ String getLastLeaderId() {
+ return null;
+ }
};
private String lastValidLeaderId;
+ private String lastLeaderId;
BehaviorState capture(final RaftActorBehavior behavior) {
if (behavior == null) {
return NULL_BEHAVIOR_STATE;
}
- final String leaderId = behavior.getLeaderId();
- if (leaderId != null) {
- lastValidLeaderId = leaderId;
+ lastLeaderId = behavior.getLeaderId();
+ if (lastLeaderId != null) {
+ lastValidLeaderId = lastLeaderId;
}
- return new SimpleBehaviorState(lastValidLeaderId, behavior);
+ return new SimpleBehaviorState(lastValidLeaderId, lastLeaderId, behavior);
}
}