The List<ReplicatedLogEntry> entries field has to be non-null
so enforce it with PreCondition. Same with leaderId. Callers
of getEntries do not need to check for null.
Change-Id: I5cd404d54e453e43456952ea2e11ea7f8f1c626c
Signed-off-by: Tcm Pantelis <tompantelis@gmail.com>
@Override
protected RaftActorBehavior handleAppendEntries(final ActorRef sender, final AppendEntries appendEntries) {
@Override
protected RaftActorBehavior handleAppendEntries(final ActorRef sender, final AppendEntries appendEntries) {
- int numLogEntries = appendEntries.getEntries() != null ? appendEntries.getEntries().size() : 0;
+ int numLogEntries = appendEntries.getEntries().size();
if (log.isTraceEnabled()) {
log.trace("{}: handleAppendEntries: {}", logName(), appendEntries);
} else if (log.isDebugEnabled() && numLogEntries > 0) {
if (log.isTraceEnabled()) {
log.trace("{}: handleAppendEntries: {}", logName(), appendEntries);
} else if (log.isDebugEnabled() && numLogEntries > 0) {
- if (appendEntries.getEntries() != null && appendEntries.getEntries().size() > 0) {
-
- log.debug("{}: Number of entries to be appended = {}", logName(),
- appendEntries.getEntries().size());
+ if (numLogEntries > 0) {
+ log.debug("{}: Number of entries to be appended = {}", logName(), numLogEntries);
// 3. If an existing entry conflicts with a new one (same index
// but different terms), delete the existing entry and all that
// 3. If an existing entry conflicts with a new one (same index
// but different terms), delete the existing entry and all that
if (context.getReplicatedLog().size() > 0) {
// Find the entry up until the one that is not in the follower's log
if (context.getReplicatedLog().size() > 0) {
// Find the entry up until the one that is not in the follower's log
- for (int i = 0;i < appendEntries.getEntries().size(); i++, addEntriesFrom++) {
+ for (int i = 0;i < numLogEntries; i++, addEntriesFrom++) {
ReplicatedLogEntry matchEntry = appendEntries.getEntries().get(i);
if (!isLogEntryPresent(matchEntry.getIndex())) {
ReplicatedLogEntry matchEntry = appendEntries.getEntries().get(i);
if (!isLogEntryPresent(matchEntry.getIndex())) {
// purged from the persisted log as well.
final AtomicBoolean shouldCaptureSnapshot = new AtomicBoolean(false);
final Procedure<ReplicatedLogEntry> appendAndPersistCallback = logEntry -> {
// purged from the persisted log as well.
final AtomicBoolean shouldCaptureSnapshot = new AtomicBoolean(false);
final Procedure<ReplicatedLogEntry> appendAndPersistCallback = logEntry -> {
- final ReplicatedLogEntry lastEntryToAppend = appendEntries.getEntries().get(
- appendEntries.getEntries().size() - 1);
+ final List<ReplicatedLogEntry> entries = appendEntries.getEntries();
+ final ReplicatedLogEntry lastEntryToAppend = entries.get(entries.size() - 1);
if (shouldCaptureSnapshot.get() && logEntry == lastEntryToAppend) {
context.getSnapshotManager().capture(context.getReplicatedLog().last(), getReplicatedToAllIndex());
}
};
// 4. Append any new entries not already in the log
if (shouldCaptureSnapshot.get() && logEntry == lastEntryToAppend) {
context.getSnapshotManager().capture(context.getReplicatedLog().last(), getReplicatedToAllIndex());
}
};
// 4. Append any new entries not already in the log
- for (int i = addEntriesFrom; i < appendEntries.getEntries().size(); i++) {
+ for (int i = addEntriesFrom; i < numLogEntries; i++) {
ReplicatedLogEntry entry = appendEntries.getEntries().get(i);
log.debug("{}: Append entry to log {}", logName(), entry.getData());
ReplicatedLogEntry entry = appendEntries.getEntries().get(i);
log.debug("{}: Append entry to log {}", logName(), entry.getData());
}
final List<ReplicatedLogEntry> entries = appendEntries.getEntries();
}
final List<ReplicatedLogEntry> entries = appendEntries.getEntries();
- if (entries != null && entries.size() > 0 && !isLogEntryPresent(entries.get(0).getIndex() - 1)) {
+ if (entries.size() > 0 && !isLogEntryPresent(entries.get(0).getIndex() - 1)) {
log.info("{}: Cannot append entries because the calculated previousIndex {} was not found in the "
+ "in-memory journal", logName(), entries.get(0).getIndex() - 1);
return true;
log.info("{}: Cannot append entries because the calculated previousIndex {} was not found in the "
+ "in-memory journal", logName(), entries.get(0).getIndex() - 1);
return true;
package org.opendaylight.controller.cluster.raft.messages;
package org.opendaylight.controller.cluster.raft.messages;
+import com.google.common.base.Preconditions;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nonnull;
import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry;
import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry;
import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
private final short payloadVersion;
private final short payloadVersion;
- public AppendEntries(long term, String leaderId, long prevLogIndex, long prevLogTerm,
- List<ReplicatedLogEntry> entries, long leaderCommit, long replicatedToAllIndex, short payloadVersion) {
+ public AppendEntries(long term, @Nonnull String leaderId, long prevLogIndex, long prevLogTerm,
+ @Nonnull List<ReplicatedLogEntry> entries, long leaderCommit, long replicatedToAllIndex,
+ short payloadVersion) {
- this.leaderId = leaderId;
+ this.leaderId = Preconditions.checkNotNull(leaderId);
this.prevLogIndex = prevLogIndex;
this.prevLogTerm = prevLogTerm;
this.prevLogIndex = prevLogIndex;
this.prevLogTerm = prevLogTerm;
- this.entries = entries;
+ this.entries = Preconditions.checkNotNull(entries);
this.leaderCommit = leaderCommit;
this.replicatedToAllIndex = replicatedToAllIndex;
this.payloadVersion = payloadVersion;
}
this.leaderCommit = leaderCommit;
this.replicatedToAllIndex = replicatedToAllIndex;
this.payloadVersion = payloadVersion;
}
public String getLeaderId() {
return leaderId;
}
public String getLeaderId() {
return leaderId;
}
public List<ReplicatedLogEntry> getEntries() {
return entries;
}
public List<ReplicatedLogEntry> getEntries() {
return entries;
}
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.junit.After;
import java.util.List;
import java.util.Map;
import org.junit.After;
// First set the receivers term to a high number (1000)
context.getTermInformation().update(1000, "test");
// First set the receivers term to a high number (1000)
context.getTermInformation().update(1000, "test");
- AppendEntries appendEntries = new AppendEntries(100, "leader-1", 0, 0, null, 101, -1, (short)4);
+ AppendEntries appendEntries = new AppendEntries(100, "leader-1", 0, 0, Collections.emptyList(), 101, -1,
+ (short)4);
behavior = createBehavior(context);
behavior = createBehavior(context);
}
protected AppendEntries createAppendEntriesWithNewerTerm() {
}
protected AppendEntries createAppendEntriesWithNewerTerm() {
- return new AppendEntries(100, "leader-1", 0, 0, null, 1, -1, (short)0);
+ return new AppendEntries(100, "leader-1", 0, 0, Collections.emptyList(), 1, -1, (short)0);
}
protected AppendEntriesReply createAppendEntriesReplyWithNewerTerm() {
}
protected AppendEntriesReply createAppendEntriesReplyWithNewerTerm() {
// AppendEntries is now sent with a bigger term
// this will set the receivers term to be the same as the sender's term
// AppendEntries is now sent with a bigger term
// this will set the receivers term to be the same as the sender's term
- AppendEntries appendEntries = new AppendEntries(100, "leader", 0, 0, null, 101, -1, (short)0);
+ AppendEntries appendEntries = new AppendEntries(100, "leader", 0, 0, Collections.emptyList(), 101, -1,
+ (short)0);
follower = createBehavior(context);
follower = createBehavior(context);