leader is elected

trex-paxos · Sep 24, 2024 · 19ad646 · 19ad646
1 parent 8dfd296
commit 19ad646
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/trex2-lib/src/main/java/com/github/trex_paxos/TrexNode.java b/trex2-lib/src/main/java/com/github/trex_paxos/TrexNode.java
@@ -181,18 +181,16 @@ case Accept(_, _, _, NoOperation _) -> {
       }
       case PrepareResponse prepareResponse -> {
         if (RECOVER == role) {
-          if (prepareResponse.catchupResponse().isPresent()) {
-            // FIXME we should handle this
-          }
-          if (prepareResponse.highestUncommitted().isPresent()) {
-              //noinspection OptionalGetWithoutIsPresent
+          if (prepareResponse.highestUncommitted().isPresent() && prepareResponse.highestCommittedIndex().isPresent()) {
               final long highestCommittedOther = prepareResponse.highestCommittedIndex().get();
               final long highestCommitted = progress.highestCommitted();
               if (highestCommitted < highestCommittedOther) {
                 // we are behind so now try to catch up
-                saveCatchup(prepareResponse.catchupResponse().get());
-                // this may be evidence of a new leader so back down
-                backdown();
+                prepareResponse.catchupResponse().ifPresent(catchupResponse -> {
+                  saveCatchup(catchupResponse);
+                  // this is evidence of a new leader so back down
+                  backdown();
+                });
               }
           } else if (prepareResponse.vote().to() == nodeIdentifier) {
             final byte from = prepareResponse.from();

diff --git a/trex2-lib/src/test/java/com/github/trex_paxos/SimulationTest.java b/trex2-lib/src/test/java/com/github/trex_paxos/SimulationTest.java
@@ -191,7 +191,7 @@ public Progress loadProgress(byte nodeIdentifier) {
 
     @Override
     public Optional<Accept> loadAccept(long logIndex) {
-      return logIndex >= fakeJournal.size() ? Optional.empty() : Optional.ofNullable(fakeJournal.get((int) logIndex));
+      return Optional.ofNullable(fakeJournal.get(logIndex));
     }
   }