Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix to topology-lldp-discovery to allow for clean karaf feature"
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
Leader.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
index 53e47c2f842f17ac0b2766811745a7f1ec6eabde..8b95e8b7a6bd57e9581d02226f99b2d44bf5cb51 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
@@
-19,7
+19,6
@@
import org.opendaylight.controller.cluster.raft.FollowerLogInformationImpl;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
import org.opendaylight.controller.cluster.raft.RaftState;
import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
import org.opendaylight.controller.cluster.raft.RaftState;
import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
-import org.opendaylight.controller.cluster.raft.base.messages.ApplyState;
import org.opendaylight.controller.cluster.raft.base.messages.Replicate;
import org.opendaylight.controller.cluster.raft.base.messages.SendHeartBeat;
import org.opendaylight.controller.cluster.raft.base.messages.SendInstallSnapshot;
import org.opendaylight.controller.cluster.raft.base.messages.Replicate;
import org.opendaylight.controller.cluster.raft.base.messages.SendHeartBeat;
import org.opendaylight.controller.cluster.raft.base.messages.SendInstallSnapshot;
@@
-112,8
+111,8
@@
public class Leader extends AbstractRaftActorBehavior {
scheduleHeartBeat(new FiniteDuration(0, TimeUnit.SECONDS));
scheduleInstallSnapshotCheck(
scheduleHeartBeat(new FiniteDuration(0, TimeUnit.SECONDS));
scheduleInstallSnapshotCheck(
- new FiniteDuration(
HEART_BEAT_INTERVAL
.length() * 1000,
-
HEART_BEAT_INTERVAL
.unit())
+ new FiniteDuration(
context.getConfigParams().getHeartBeatInterval()
.length() * 1000,
+
context.getConfigParams().getHeartBeatInterval()
.unit())
);
}
);
}
@@
-241,7
+240,7
@@
public class Leader extends AbstractRaftActorBehavior {
(InstallSnapshotReply) message);
}
} finally {
(InstallSnapshotReply) message);
}
} finally {
- scheduleHeartBeat(
HEART_BEAT_INTERVAL
);
+ scheduleHeartBeat(
context.getConfigParams().getHeartBeatInterval()
);
}
return super.handleMessage(sender, message);
}
return super.handleMessage(sender, message);
@@
-264,26
+263,18
@@
public class Leader extends AbstractRaftActorBehavior {
context.getLogger().debug("Replicate message " + logIndex);
context.getLogger().debug("Replicate message " + logIndex);
+ // Create a tracker entry we will use this later to notify the
+ // client actor
+ trackerList.add(
+ new ClientRequestTrackerImpl(replicate.getClientActor(),
+ replicate.getIdentifier(),
+ logIndex)
+ );
+
if (followers.size() == 0) {
if (followers.size() == 0) {
- context.setCommitIndex(
- replicate.getReplicatedLogEntry().getIndex());
-
- context.getActor()
- .tell(new ApplyState(replicate.getClientActor(),
- replicate.getIdentifier(),
- replicate.getReplicatedLogEntry()),
- context.getActor()
- );
+ context.setCommitIndex(logIndex);
+ applyLogToStateMachine(logIndex);
} else {
} else {
-
- // Create a tracker entry we will use this later to notify the
- // client actor
- trackerList.add(
- new ClientRequestTrackerImpl(replicate.getClientActor(),
- replicate.getIdentifier(),
- logIndex)
- );
-
sendAppendEntries();
}
}
sendAppendEntries();
}
}
@@
-310,7
+301,7
@@
public class Leader extends AbstractRaftActorBehavior {
// that has fallen too far behind with the log but yet is not
// eligible to receive a snapshot
entries =
// that has fallen too far behind with the log but yet is not
// eligible to receive a snapshot
entries =
- context.getReplicatedLog().getFrom(nextIndex);
+ context.getReplicatedLog().getFrom(nextIndex
, 1
);
}
followerActor.tell(
}
followerActor.tell(