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 "BUG 1853 : Clustered Data Store causes Out of Memory"
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
RaftActor.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
index c8cbcca6e8609834500af3c5511273b49a8ca329..190f1bd409e6c69ad8f8d8df30a6eaee7a04b3a7 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
@@
-123,7
+123,7
@@
public abstract class RaftActor extends UntypedPersistentActor {
@Override public void onReceiveRecover(Object message) {
if (message instanceof SnapshotOffer) {
@Override public void onReceiveRecover(Object message) {
if (message instanceof SnapshotOffer) {
- LOG.
debug
("SnapshotOffer called..");
+ LOG.
info
("SnapshotOffer called..");
SnapshotOffer offer = (SnapshotOffer) message;
Snapshot snapshot = (Snapshot) offer.snapshot();
SnapshotOffer offer = (SnapshotOffer) message;
Snapshot snapshot = (Snapshot) offer.snapshot();
@@
-135,10
+135,11
@@
public abstract class RaftActor extends UntypedPersistentActor {
context.setReplicatedLog(replicatedLog);
context.setLastApplied(snapshot.getLastAppliedIndex());
context.setReplicatedLog(replicatedLog);
context.setLastApplied(snapshot.getLastAppliedIndex());
- LOG.
debug
("Applied snapshot to replicatedLog. " +
- "snapshotIndex={}, snapshotTerm={}, journal-size={}",
+ LOG.
info
("Applied snapshot to replicatedLog. " +
+
"snapshotIndex={}, snapshotTerm={}, journal-size={}",
replicatedLog.snapshotIndex, replicatedLog.snapshotTerm,
replicatedLog.snapshotIndex, replicatedLog.snapshotTerm,
- replicatedLog.size());
+ replicatedLog.size()
+ );
// Apply the snapshot to the actors state
applySnapshot(ByteString.copyFrom(snapshot.getState()));
// Apply the snapshot to the actors state
applySnapshot(ByteString.copyFrom(snapshot.getState()));
@@
-236,17
+237,17
@@
public abstract class RaftActor extends UntypedPersistentActor {
context.removePeer(rrp.getName());
} else if (message instanceof CaptureSnapshot) {
context.removePeer(rrp.getName());
} else if (message instanceof CaptureSnapshot) {
- LOG.
debug
("CaptureSnapshot received by actor");
+ LOG.
info
("CaptureSnapshot received by actor");
CaptureSnapshot cs = (CaptureSnapshot)message;
captureSnapshot = cs;
createSnapshot();
} else if (message instanceof CaptureSnapshotReply){
CaptureSnapshot cs = (CaptureSnapshot)message;
captureSnapshot = cs;
createSnapshot();
} else if (message instanceof CaptureSnapshotReply){
- LOG.
debug
("CaptureSnapshotReply received by actor");
+ LOG.
info
("CaptureSnapshotReply received by actor");
CaptureSnapshotReply csr = (CaptureSnapshotReply) message;
ByteString stateInBytes = csr.getSnapshot();
CaptureSnapshotReply csr = (CaptureSnapshotReply) message;
ByteString stateInBytes = csr.getSnapshot();
- LOG.
debug
("CaptureSnapshotReply stateInBytes size:{}", stateInBytes.size());
+ LOG.
info
("CaptureSnapshotReply stateInBytes size:{}", stateInBytes.size());
handleCaptureSnapshotReply(stateInBytes);
} else {
handleCaptureSnapshotReply(stateInBytes);
} else {
@@
-262,6
+263,8
@@
public abstract class RaftActor extends UntypedPersistentActor {
if(oldBehavior != currentBehavior){
onStateChanged();
}
if(oldBehavior != currentBehavior){
onStateChanged();
}
+
+ onLeaderChanged(oldBehavior.getLeaderId(), currentBehavior.getLeaderId());
}
}
}
}
@@
-426,6
+429,8
@@
public abstract class RaftActor extends UntypedPersistentActor {
*/
protected abstract void onStateChanged();
*/
protected abstract void onStateChanged();
+ protected void onLeaderChanged(String oldLeader, String newLeader){};
+
private RaftActorBehavior switchBehavior(RaftState state) {
if (currentBehavior != null) {
if (currentBehavior.state() == state) {
private RaftActorBehavior switchBehavior(RaftState state) {
if (currentBehavior != null) {
if (currentBehavior.state() == state) {