Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Keep track of last applied command inside the state machine.
This ensures that RaftInstance doesn't try to apply commands that were already applied by RaftLogReplay.
- Loading branch information
Showing
6 changed files
with
141 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...ore-edge/src/main/java/org/neo4j/coreedge/raft/state/LastAppliedTrackingStateMachine.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Copyright (c) 2002-2016 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.coreedge.raft.state; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.neo4j.coreedge.raft.replication.ReplicatedContent; | ||
|
|
||
| import static java.lang.Math.max; | ||
|
|
||
| public class LastAppliedTrackingStateMachine implements StateMachine | ||
| { | ||
| public static final long NOTHING_APPLIED = -1; | ||
|
|
||
| private final StateMachine stateMachine; | ||
| private long lastApplied = NOTHING_APPLIED; | ||
|
|
||
| public LastAppliedTrackingStateMachine( StateMachine stateMachine ) | ||
| { | ||
| this.stateMachine = stateMachine; | ||
| } | ||
|
|
||
| @Override | ||
| public void applyCommand( ReplicatedContent content, long logIndex ) | ||
| { | ||
| stateMachine.applyCommand( content, logIndex ); | ||
| lastApplied = max( logIndex, lastApplied ); | ||
| } | ||
|
|
||
| @Override | ||
| public void flush() throws IOException | ||
| { | ||
| stateMachine.flush(); | ||
| } | ||
|
|
||
| public long lastApplied() | ||
| { | ||
| return lastApplied; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...edge/src/test/java/org/neo4j/coreedge/raft/state/LastAppliedTrackingStateMachineTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Copyright (c) 2002-2016 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.coreedge.raft.state; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import org.neo4j.coreedge.raft.ReplicatedInteger; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| import static org.neo4j.coreedge.raft.state.LastAppliedTrackingStateMachine.NOTHING_APPLIED; | ||
|
|
||
| public class LastAppliedTrackingStateMachineTest | ||
| { | ||
| @Test | ||
| public void shouldInitiallyHaveNothingApplied() throws Exception | ||
| { | ||
| // given | ||
| LastAppliedTrackingStateMachine lastAppliedTrackingStateMachine = new LastAppliedTrackingStateMachine( mock( StateMachines.class ) ); | ||
|
|
||
| // then | ||
| assertEquals( NOTHING_APPLIED, lastAppliedTrackingStateMachine.lastApplied() ); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldKeepTrackOfTheLastAppliedIndex() throws Exception | ||
| { | ||
| // given | ||
| LastAppliedTrackingStateMachine lastAppliedTrackingStateMachine = new LastAppliedTrackingStateMachine( mock( StateMachines.class ) ); | ||
|
|
||
| // when | ||
| lastAppliedTrackingStateMachine.applyCommand( ReplicatedInteger.valueOf( 1 ), 1 ); | ||
|
|
||
| // then | ||
| assertEquals( 1, lastAppliedTrackingStateMachine.lastApplied() ); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldKeepHighestIndexSeenSoFar() throws Exception | ||
| { | ||
| // given | ||
| LastAppliedTrackingStateMachine lastAppliedTrackingStateMachine = new LastAppliedTrackingStateMachine( mock( StateMachines.class ) ); | ||
|
|
||
| // when | ||
| lastAppliedTrackingStateMachine.applyCommand( ReplicatedInteger.valueOf( 1 ), 9 ); | ||
| lastAppliedTrackingStateMachine.applyCommand( ReplicatedInteger.valueOf( 1 ), 1 ); | ||
|
|
||
| // then | ||
| assertEquals( 9, lastAppliedTrackingStateMachine.lastApplied() ); | ||
| } | ||
| } |