peterxcli commented on code in PR #8104:
URL: https://github.com/apache/ozone/pull/8104#discussion_r2003360140
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java:
##########
@@ -137,45 +162,46 @@ public void testWriteFailure(boolean failWithException)
throws ExecutionExceptio
.setResult(ContainerProtos.Result.CONTAINER_INTERNAL_ERROR)
.build());
}
+ }
+ public final void setUpMockRequestProtoReturn(ContainerStateMachine.Context
context, String content,
Review Comment:
```suggestion
private final void
setUpMockRequestProtoReturn(ContainerStateMachine.Context context,
```
Since all content are the same, it can be moved to class Initialization
```java
abstract class TestContainerStateMachine {
...
private final ByteString CONTAINER_DATA = ByteString.copyFromUtf8("Test
Data");
```
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java:
##########
@@ -129,6 +129,31 @@ public void testWriteFailure(boolean failWithException)
throws ExecutionExceptio
TransactionContext trx = mock(TransactionContext.class);
ContainerStateMachine.Context context =
mock(ContainerStateMachine.Context.class);
when(trx.getStateMachineContext()).thenReturn(context);
+
+ setUpMockDispatcherReturn(failWithException);
+ setUpMockRequestProtoReturn(context, "Test Data", 1, 1);
+
+ AtomicReference<Throwable> throwable = new AtomicReference<>(null);
+ Function<Throwable, ? extends Message> throwableSetter =
getThrowableSetter(throwable);
+
+ stateMachine.write(entry, trx).exceptionally(throwableSetter).get();
+ verify(dispatcher,
times(1)).dispatch(any(ContainerProtos.ContainerCommandRequestProto.class),
+ any(DispatcherContext.class));
+ reset(dispatcher);
+ assertNotNull(throwable.get());
+ assertResults(failWithException, throwable);
+
+ // Writing data to another container(containerId 2) should also fail.
+ setUpMockRequestProtoReturn(context, "Test Data", 2, 1);
Review Comment:
ditto
```suggestion
setUpMockRequestProtoReturn(context, 2, 1);
```
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java:
##########
@@ -129,6 +129,31 @@ public void testWriteFailure(boolean failWithException)
throws ExecutionExceptio
TransactionContext trx = mock(TransactionContext.class);
ContainerStateMachine.Context context =
mock(ContainerStateMachine.Context.class);
when(trx.getStateMachineContext()).thenReturn(context);
+
+ setUpMockDispatcherReturn(failWithException);
+ setUpMockRequestProtoReturn(context, "Test Data", 1, 1);
Review Comment:
ditto
```suggestion
setUpMockRequestProtoReturn(context, 1, 1);
```
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java:
##########
@@ -129,6 +129,31 @@ public void testWriteFailure(boolean failWithException)
throws ExecutionExceptio
TransactionContext trx = mock(TransactionContext.class);
ContainerStateMachine.Context context =
mock(ContainerStateMachine.Context.class);
when(trx.getStateMachineContext()).thenReturn(context);
+
+ setUpMockDispatcherReturn(failWithException);
+ setUpMockRequestProtoReturn(context, "Test Data", 1, 1);
+
+ AtomicReference<Throwable> throwable = new AtomicReference<>(null);
+ Function<Throwable, ? extends Message> throwableSetter =
getThrowableSetter(throwable);
+
+ stateMachine.write(entry, trx).exceptionally(throwableSetter).get();
+ verify(dispatcher,
times(1)).dispatch(any(ContainerProtos.ContainerCommandRequestProto.class),
+ any(DispatcherContext.class));
+ reset(dispatcher);
+ assertNotNull(throwable.get());
+ assertResults(failWithException, throwable);
+
+ // Writing data to another container(containerId 2) should also fail.
+ setUpMockRequestProtoReturn(context, "Test Data", 2, 1);
+ stateMachine.write(entryNext, trx).exceptionally(throwableSetter).get();
+ verify(dispatcher,
times(0)).dispatch(any(ContainerProtos.ContainerCommandRequestProto.class),
+ any(DispatcherContext.class));
+ assertInstanceOf(StorageContainerException.class, throwable.get());
+ StorageContainerException sce = (StorageContainerException)
throwable.get();
+ assertEquals(ContainerProtos.Result.CONTAINER_UNHEALTHY, sce.getResult());
+ }
+
+ public final void setUpMockDispatcherReturn(boolean failWithException) {
Review Comment:
nit:
```suggestion
private final void setUpMockDispatcherReturn(boolean failWithException) {
```
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java:
##########
@@ -275,13 +275,7 @@ public void testWriteTimout() throws Exception {
return null;
}).when(dispatcher).dispatch(any(), any());
-
when(context.getRequestProto()).thenReturn(ContainerProtos.ContainerCommandRequestProto.newBuilder()
- .setCmdType(ContainerProtos.Type.WriteChunk).setWriteChunk(
-
ContainerProtos.WriteChunkRequestProto.newBuilder().setData(ByteString.copyFromUtf8("Test
Data"))
- .setBlockID(
-
ContainerProtos.DatanodeBlockID.newBuilder().setContainerID(1).setLocalID(1).build()).build())
- .setContainerID(1)
- .setDatanodeUuid(UUID.randomUUID().toString()).build());
+ setUpMockRequestProtoReturn(context, "Test data", 1, 1);
Review Comment:
ditto
```suggestion
setUpMockRequestProtoReturn(context, 1, 1);
```
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java:
##########
@@ -137,45 +162,46 @@ public void testWriteFailure(boolean failWithException)
throws ExecutionExceptio
.setResult(ContainerProtos.Result.CONTAINER_INTERNAL_ERROR)
.build());
}
+ }
+ public final void setUpMockRequestProtoReturn(ContainerStateMachine.Context
context, String content,
+ int containerId, int localId) {
when(context.getRequestProto()).thenReturn(ContainerProtos.ContainerCommandRequestProto.newBuilder()
.setCmdType(ContainerProtos.Type.WriteChunk).setWriteChunk(
-
ContainerProtos.WriteChunkRequestProto.newBuilder().setData(ByteString.copyFromUtf8("Test
Data"))
+
ContainerProtos.WriteChunkRequestProto.newBuilder().setData(ByteString.copyFromUtf8(content))
.setBlockID(
-
ContainerProtos.DatanodeBlockID.newBuilder().setContainerID(1).setLocalID(1).build()).build())
- .setContainerID(1)
+
ContainerProtos.DatanodeBlockID.newBuilder().setContainerID(containerId)
+ .setLocalID(localId).build()).build())
+ .setContainerID(containerId)
.setDatanodeUuid(UUID.randomUUID().toString()).build());
- AtomicReference<Throwable> throwable = new AtomicReference<>(null);
+ }
+
+ public final Function<Throwable, ? extends Message>
getThrowableSetter(AtomicReference<Throwable> throwable) {
Review Comment:
another suggestion is replace `getThrowableSetter` with:
```java
private static class ThrowableCatcher {
private final AtomicReference<Throwable> caught = new
AtomicReference<>(null);
public Function<Throwable, ? extends Message> asSetter() {
return t -> {
caught.set(t);
return null;
};
}
public Throwable getReceived() {
return caught.get();
}
public void reset() {
caught.set(null);
}
}
```
Then we can use:
```java
ThrowableCatcher catcher = new ThrowableCatcher();
stateMachine.write(entry, trx).exceptionally(catcher.asSetter()).get();
assertNotNull(catcher.getReceived());
```
But this is up to you, this change has few benefit at this time.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
