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-2573: add NormalizedNode-based RPC API"
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
AbstractRaftActorBehavior.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java
index 99824b0bb4e6235a56d12cb719384fee85fd309a..075b2873e45332364c09aee83c49e6b23e40780c 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java
@@
-10,7
+10,6
@@
package org.opendaylight.controller.cluster.raft.behaviors;
import akka.actor.ActorRef;
import akka.actor.Cancellable;
import akka.actor.ActorRef;
import akka.actor.Cancellable;
-import akka.event.LoggingAdapter;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import org.opendaylight.controller.cluster.raft.ClientRequestTracker;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import org.opendaylight.controller.cluster.raft.ClientRequestTracker;
@@
-24,6
+23,7
@@
import org.opendaylight.controller.cluster.raft.messages.AppendEntries;
import org.opendaylight.controller.cluster.raft.messages.AppendEntriesReply;
import org.opendaylight.controller.cluster.raft.messages.RequestVote;
import org.opendaylight.controller.cluster.raft.messages.RequestVoteReply;
import org.opendaylight.controller.cluster.raft.messages.AppendEntriesReply;
import org.opendaylight.controller.cluster.raft.messages.RequestVote;
import org.opendaylight.controller.cluster.raft.messages.RequestVoteReply;
+import org.slf4j.Logger;
import scala.concurrent.duration.FiniteDuration;
/**
import scala.concurrent.duration.FiniteDuration;
/**
@@
-46,7
+46,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
/**
*
*/
/**
*
*/
- protected final Logg
ingAdapt
er LOG;
+ protected final Logger LOG;
/**
*
/**
*
@@
-349,7
+349,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
} else {
//if one index is not present in the log, no point in looping
// around as the rest wont be present either
} else {
//if one index is not present in the log, no point in looping
// around as the rest wont be present either
- LOG.warn
ing
(
+ LOG.warn(
"{}: Missing index {} from log. Cannot apply state. Ignoring {} to {}",
context.getId(), i, i, index);
break;
"{}: Missing index {} from log. Cannot apply state. Ignoring {} to {}",
context.getId(), i, i, index);
break;
@@
-394,7
+394,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
try {
close();
} catch (Exception e) {
try {
close();
} catch (Exception e) {
- LOG.error(
e, "{}: Failed to close behavior : {}", context.getId(), this.state()
);
+ LOG.error(
"{}: Failed to close behavior : {}", context.getId(), this.state(), e
);
}
return behavior;
}
return behavior;