merge: #10799

10799: [Backport stable/8.1] Stop raft server when going inactive due to unrecoverable errors r=deepthidevaki a=backport-action # Description Backport of #10776 to `stable/8.1`. closes #9924 Co-authored-by: Deepthi Devaki Akkoorath <deepthidevaki@gmail.com>
camunda · Oct 24, 2022 · 1ab4bb6 · 1ab4bb6
2 parents 61df419 + eb00595
commit 1ab4bb6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/atomix/cluster/src/main/java/io/atomix/raft/partition/RaftPartition.java b/atomix/cluster/src/main/java/io/atomix/raft/partition/RaftPartition.java
@@ -246,8 +246,8 @@ private boolean shouldStepDown() {
         && primary.get() != server.getMemberId();
   }
 
-  public CompletableFuture<Void> goInactive() {
-    return server.goInactive();
+  public CompletableFuture<Void> stop() {
+    return server.stop();
   }
 
   public PartitionMetadata getMetadata() {

diff --git a/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/ZeebePartition.java b/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/ZeebePartition.java
@@ -366,16 +366,15 @@ private void handleRecoverableFailure() {
           context.getPartitionId(),
           context.getCurrentRole(),
           context.getCurrentTerm());
-      context.getRaftPartition().goInactive();
+      context.getRaftPartition().stop();
     }
   }
 
   private void handleUnrecoverableFailure(final Throwable error) {
     final var report = HealthReport.dead(this).withIssue(error);
     healthMetrics.setDead();
     zeebePartitionHealth.onUnrecoverableFailure(error);
-    transitionToInactive();
-    context.getRaftPartition().goInactive();
+    context.getRaftPartition().stop();
     failureListeners.forEach((l) -> l.onUnrecoverableFailure(report));
     context.notifyListenersOfBecomingInactive();
   }

diff --git a/broker/src/test/java/io/camunda/zeebe/broker/system/partitions/ZeebePartitionTest.java b/broker/src/test/java/io/camunda/zeebe/broker/system/partitions/ZeebePartitionTest.java
@@ -232,7 +232,7 @@ public void shouldNotTriggerTransitionOnPartitionTransitionException()
     order.verify(transition).toLeader(2);
     // after failing leader transition no other
     // transitions are triggered
-    order.verify(raft, times(0)).goInactive();
+    order.verify(raft, times(0)).stop();
     order.verify(transition, times(0)).toFollower(anyLong());
   }
 
@@ -251,7 +251,7 @@ public void shouldGoInactiveAfterFailedFollowerTransition() throws InterruptedEx
             });
     when(raft.getRole()).thenReturn(Role.FOLLOWER);
     when(ctx.getCurrentRole()).thenReturn(Role.FOLLOWER);
-    when(raft.goInactive())
+    when(raft.stop())
         .then(
             invocation -> {
               partition.onNewRole(Role.INACTIVE, 2);
@@ -267,37 +267,28 @@ public void shouldGoInactiveAfterFailedFollowerTransition() throws InterruptedEx
     // then
     final InOrder order = inOrder(transition, raft);
     order.verify(transition).toFollower(0L);
-    order.verify(raft).goInactive();
+    order.verify(raft).stop();
     order.verify(transition).toInactive(anyLong());
   }
 
   @Test
   public void shouldGoInactiveIfTransitionHasUnrecoverableFailure() throws InterruptedException {
     // given
-    final CountDownLatch latch = new CountDownLatch(1);
     when(transition.toLeader(anyLong()))
         .thenReturn(
             CompletableActorFuture.completedExceptionally(new UnrecoverableException("expected")));
-    when(transition.toInactive(anyLong()))
-        .then(
-            invocation -> {
-              latch.countDown();
-              return CompletableActorFuture.completed(null);
-            });
     when(raft.getRole()).thenReturn(Role.LEADER);
     when(raft.term()).thenReturn(1L);
 
     // when
     schedulerRule.submitActor(partition);
     partition.onNewRole(raft.getRole(), raft.term());
     schedulerRule.workUntilDone();
-    assertThat(latch.await(30, TimeUnit.SECONDS)).isTrue();
 
     // then
     final InOrder order = inOrder(transition, raft);
     order.verify(transition).toLeader(0L);
-    order.verify(transition).toInactive(anyLong());
-    order.verify(raft).goInactive();
+    order.verify(raft).stop();
   }
 
   @Test