Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Simplify recoveryTime computation
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
RaftActorRecoverySupport.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java
index 283aa8f142087c2421f58d7a116351652c58575f..873b8514a2e30038f4327a01507df063b2468211 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java
@@
-246,11
+246,12
@@
class RaftActorRecoverySupport {
endCurrentLogRecoveryBatch();
}
endCurrentLogRecoveryBatch();
}
-
String recoveryTime = ""
;
+
final String recoveryTime
;
if (recoveryTimer != null) {
if (recoveryTimer != null) {
- recoveryTimer.stop();
- recoveryTime = " in " + recoveryTimer.toString();
+ recoveryTime = " in " + recoveryTimer.stop();
recoveryTimer = null;
recoveryTimer = null;
+ } else {
+ recoveryTime = "";
}
log.info("{}: Recovery completed {} - Switching actor to Follower - last log index = {}, last log term = {}, "
}
log.info("{}: Recovery completed {} - Switching actor to Follower - last log index = {}, last log term = {}, "