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 "Unit Test for md-sal netconf northbound mapping. Tests mapping of netconf...
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
AbstractLeader.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
index 1552096ef15aed6bf8f941a1c24474c9ca8cbe44..890d45e8fb664b20a4f27e8996d38b15e27a0120 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
@@
-97,9
+97,7
@@
public abstract class AbstractLeader extends AbstractRaftActorBehavior {
final Builder<String, FollowerLogInformation> ftlBuilder = ImmutableMap.builder();
for (String followerId : context.getPeerAddresses().keySet()) {
FollowerLogInformation followerLogInformation =
final Builder<String, FollowerLogInformation> ftlBuilder = ImmutableMap.builder();
for (String followerId : context.getPeerAddresses().keySet()) {
FollowerLogInformation followerLogInformation =
- new FollowerLogInformationImpl(followerId,
- context.getCommitIndex(), -1,
- context.getConfigParams().getElectionTimeOutInterval());
+ new FollowerLogInformationImpl(followerId, -1, context);
ftlBuilder.put(followerId, followerLogInformation);
}
ftlBuilder.put(followerId, followerLogInformation);
}
@@
-126,6
+124,9
@@
public abstract class AbstractLeader extends AbstractRaftActorBehavior {
// (heartbeat) to each server; repeat during idle periods to
// prevent election timeouts (§5.2)
sendAppendEntries(0, false);
// (heartbeat) to each server; repeat during idle periods to
// prevent election timeouts (§5.2)
sendAppendEntries(0, false);
+
+ // It is important to schedule this heartbeat here
+ scheduleHeartBeat(context.getConfigParams().getHeartBeatInterval());
}
/**
}
/**
@@
-304,28
+305,26
@@
public abstract class AbstractLeader extends AbstractRaftActorBehavior {
}
}
}
}
-
try
{
- if (message instanceof SendHeartBeat) {
-
beforeSendHeartb
eat();
-
sendHeartBeat(
);
-
return this;
+
if (message instanceof SendHeartBeat)
{
+ beforeSendHeartbeat();
+
sendHeartB
eat();
+
scheduleHeartBeat(context.getConfigParams().getHeartBeatInterval()
);
+ return this;
-
} else if(message instanceof SendInstallSnapshot) {
-
// received from RaftActor
-
setSnapshot(Optional.of(((SendInstallSnapshot) message).getSnapshot()));
-
sendInstallSnapshot();
+ } else if(message instanceof SendInstallSnapshot) {
+ // received from RaftActor
+ setSnapshot(Optional.of(((SendInstallSnapshot) message).getSnapshot()));
+ sendInstallSnapshot();
-
} else if (message instanceof Replicate) {
-
replicate((Replicate) message);
+ } else if (message instanceof Replicate) {
+ replicate((Replicate) message);
-
} else if (message instanceof InstallSnapshotReply){
-
handleInstallSnapshotReply((InstallSnapshotReply) message);
+ } else if (message instanceof InstallSnapshotReply){
+ handleInstallSnapshotReply((InstallSnapshotReply) message);
- }
- } finally {
- scheduleHeartBeat(context.getConfigParams().getHeartBeatInterval());
}
}
+
return super.handleMessage(sender, message);
}
return super.handleMessage(sender, message);
}