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 changes I114cbac1,I45c2e7cd
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
ReplicatedLog.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLog.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLog.java
index 80b7ad90d05dbb1e9fe45ec57a65a44dedfe4463..8388eaf7436f251c63aa277024bf886f803153cb 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLog.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLog.java
@@
-8,6
+8,7
@@
package org.opendaylight.controller.cluster.raft;
package org.opendaylight.controller.cluster.raft;
+import akka.japi.Procedure;
import java.util.List;
/**
import java.util.List;
/**
@@
-50,8
+51,9
@@
public interface ReplicatedLog {
* information
*
* @param index the index of the log entry
* information
*
* @param index the index of the log entry
+ * @return the adjusted index of the first log entry removed or -1 if log entry not found.
*/
*/
-
void
removeFrom(long index);
+
long
removeFrom(long index);
/**
/**
@@
-85,6
+87,8
@@
public interface ReplicatedLog {
*/
void appendAndPersist(final ReplicatedLogEntry replicatedLogEntry);
*/
void appendAndPersist(final ReplicatedLogEntry replicatedLogEntry);
+ void appendAndPersist(ReplicatedLogEntry replicatedLogEntry, Procedure<ReplicatedLogEntry> callback);
+
/**
*
* @param index the index of the log entry
/**
*
* @param index the index of the log entry
@@
-145,14
+149,14
@@
public interface ReplicatedLog {
* sets snapshot term
* @param snapshotTerm
*/
* sets snapshot term
* @param snapshotTerm
*/
-
public
void setSnapshotTerm(long snapshotTerm);
+ void setSnapshotTerm(long snapshotTerm);
/**
* Clears the journal entries with startIndex(inclusive) and endIndex (exclusive)
* @param startIndex
* @param endIndex
*/
/**
* Clears the journal entries with startIndex(inclusive) and endIndex (exclusive)
* @param startIndex
* @param endIndex
*/
-
public
void clear(int startIndex, int endIndex);
+ void clear(int startIndex, int endIndex);
/**
* Handles all the bookkeeping in order to perform a rollback in the
/**
* Handles all the bookkeeping in order to perform a rollback in the
@@
-160,20
+164,21
@@
public interface ReplicatedLog {
* @param snapshotCapturedIndex
* @param snapshotCapturedTerm
*/
* @param snapshotCapturedIndex
* @param snapshotCapturedTerm
*/
-
public
void snapshotPreCommit(long snapshotCapturedIndex, long snapshotCapturedTerm);
+ void snapshotPreCommit(long snapshotCapturedIndex, long snapshotCapturedTerm);
/**
* Sets the Replicated log to state after snapshot success.
*/
/**
* Sets the Replicated log to state after snapshot success.
*/
-
public
void snapshotCommit();
+ void snapshotCommit();
/**
* Restores the replicated log to a state in the event of a save snapshot failure
*/
/**
* Restores the replicated log to a state in the event of a save snapshot failure
*/
-
public
void snapshotRollback();
+ void snapshotRollback();
/**
* Size of the data in the log (in bytes)
*/
/**
* Size of the data in the log (in bytes)
*/
- public int dataSize();
+ int dataSize();
+
}
}