This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new c8e77f8f06 HDDS-12602. Intermittent failure in 
TestContainerStateMachine.testWriteFailure (#8099)
c8e77f8f06 is described below

commit c8e77f8f06d61ce256ea5501d69f5be9b76fd215
Author: Peter Lee <[email protected]>
AuthorDate: Tue Mar 18 00:34:22 2025 +0800

    HDDS-12602. Intermittent failure in 
TestContainerStateMachine.testWriteFailure (#8099)
---
 .../common/transport/server/ratis/TestContainerStateMachine.java     | 5 ++++-
 .../transport/server/ratis/TestContainerStateMachineFollower.java    | 3 ---
 .../transport/server/ratis/TestContainerStateMachineLeader.java      | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
 
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
index 22a335e159..a0c543d723 100644
--- 
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
+++ 
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
@@ -123,6 +123,9 @@ public void testWriteFailure(boolean failWithException) 
throws ExecutionExceptio
     RaftProtos.LogEntryProto entry = mock(RaftProtos.LogEntryProto.class);
     when(entry.getTerm()).thenReturn(1L);
     when(entry.getIndex()).thenReturn(1L);
+    RaftProtos.LogEntryProto entryNext = mock(RaftProtos.LogEntryProto.class);
+    when(entryNext.getTerm()).thenReturn(1L);
+    when(entryNext.getIndex()).thenReturn(2L);
     TransactionContext trx = mock(TransactionContext.class);
     ContainerStateMachine.Context context = 
mock(ContainerStateMachine.Context.class);
     when(trx.getStateMachineContext()).thenReturn(context);
@@ -167,7 +170,7 @@ public void testWriteFailure(boolean failWithException) 
throws ExecutionExceptio
                     
ContainerProtos.DatanodeBlockID.newBuilder().setContainerID(2).setLocalID(1).build()).build())
         .setContainerID(2)
         .setDatanodeUuid(UUID.randomUUID().toString()).build());
-    stateMachine.write(entry, trx).exceptionally(throwableSetter).get();
+    stateMachine.write(entryNext, trx).exceptionally(throwableSetter).get();
     verify(dispatcher, 
times(0)).dispatch(any(ContainerProtos.ContainerCommandRequestProto.class),
         any(DispatcherContext.class));
     assertInstanceOf(StorageContainerException.class, throwable.get());
diff --git 
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
 
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
index 3560353626..e63dfac3ff 100644
--- 
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
+++ 
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
@@ -17,12 +17,9 @@
 
 package org.apache.hadoop.ozone.container.common.transport.server.ratis;
 
-import org.apache.ozone.test.tag.Flaky;
-
 /**
  * Test class to ContainerStateMachine class for follower.
  */
-@Flaky("HDDS-12602")
 public class TestContainerStateMachineFollower extends 
TestContainerStateMachine {
   public TestContainerStateMachineFollower() {
     super(false);
diff --git 
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
 
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
index b3d4fae6f6..29ded1465b 100644
--- 
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
+++ 
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
@@ -17,12 +17,9 @@
 
 package org.apache.hadoop.ozone.container.common.transport.server.ratis;
 
-import org.apache.ozone.test.tag.Flaky;
-
 /**
  * Test class to ContainerStateMachine class for leader.
  */
-@Flaky("HDDS-12602")
 public class TestContainerStateMachineLeader extends TestContainerStateMachine 
{
   public TestContainerStateMachineLeader() {
     super(true);


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to