adoroszlai commented on a change in pull request #2829:
URL: https://github.com/apache/ozone/pull/2829#discussion_r777457382
##########
File path:
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
##########
@@ -380,4 +399,31 @@ private ContainerCommandRequestProto getReadChunkRequest(
.build();
}
+ private ContainerCommandRequestProto getPutBlockRequest(
+ ContainerCommandRequestProto writeChunkRequest) {
+ ContainerProtos.BlockData.Builder block =
+ ContainerProtos.BlockData.newBuilder()
+ .setSize(writeChunkRequest.getWriteChunk().getChunkData().getLen())
+ .setBlockID(writeChunkRequest.getWriteChunk().getBlockID())
+ .addChunks(writeChunkRequest.getWriteChunk().getChunkData());
+ return ContainerCommandRequestProto.newBuilder()
+ .setContainerID(writeChunkRequest.getContainerID())
+ .setCmdType(ContainerProtos.Type.PutBlock)
+ .setDatanodeUuid(writeChunkRequest.getDatanodeUuid())
+ .setPutBlock(ContainerProtos.PutBlockRequestProto.newBuilder()
+ .setBlockData(block.build())
+ .build())
+ .build();
+ }
+
+ private ContainerCommandRequestProto getListBlockRequest(
+ ContainerCommandRequestProto writeChunkRequest) {
+ return ContainerCommandRequestProto.newBuilder()
+ .setContainerID(writeChunkRequest.getContainerID())
+ .setCmdType(ContainerProtos.Type.ListBlock)
+ .setDatanodeUuid(writeChunkRequest.getDatanodeUuid())
+ .setListBlock(ContainerProtos.ListBlockRequestProto.newBuilder()
+ .setCount(10).build())
+ .build();
+ }
Review comment:
Can you please move this to `ContainerTestHelper`?
##########
File path:
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ContainerCommandResponseBuilders.java
##########
@@ -165,6 +166,18 @@ public static ContainerCommandResponseProto
getBlockDataResponse(
.build();
}
+ public static ContainerCommandResponseProto getListBlockResponse(
+ ContainerCommandRequestProto msg, List<BlockData> data) {
+
+ ListBlockResponseProto.Builder builder =
+ ListBlockResponseProto.newBuilder();
+ for(int i = 0; i < data.size(); i++) {
+ builder.addBlockData(data.get(i));
+ }
Review comment:
Nit: we can add all items at once.
```suggestion
builder.addAllBlockData(data);
```
##########
File path:
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
##########
@@ -380,4 +399,31 @@ private ContainerCommandRequestProto getReadChunkRequest(
.build();
}
+ private ContainerCommandRequestProto getPutBlockRequest(
+ ContainerCommandRequestProto writeChunkRequest) {
+ ContainerProtos.BlockData.Builder block =
+ ContainerProtos.BlockData.newBuilder()
+ .setSize(writeChunkRequest.getWriteChunk().getChunkData().getLen())
+ .setBlockID(writeChunkRequest.getWriteChunk().getBlockID())
+ .addChunks(writeChunkRequest.getWriteChunk().getChunkData());
+ return ContainerCommandRequestProto.newBuilder()
+ .setContainerID(writeChunkRequest.getContainerID())
+ .setCmdType(ContainerProtos.Type.PutBlock)
+ .setDatanodeUuid(writeChunkRequest.getDatanodeUuid())
+ .setPutBlock(ContainerProtos.PutBlockRequestProto.newBuilder()
+ .setBlockData(block.build())
+ .build())
+ .build();
+ }
Review comment:
Please reuse existing code from `ContainerTestHelper`:
https://github.com/apache/ozone/blob/e6179c1ec6d77a46687c513ab63b81d7c62e9796/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java#L408-L462
##########
File path:
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
##########
@@ -545,6 +546,43 @@ ContainerCommandResponseProto
handleGetCommittedBlockLength(
return getBlockLengthResponse(request, blockLength);
}
+ /**
+ * Handle List Block operation. Calls BlockManager to process the request.
+ */
+ ContainerCommandResponseProto handleListBlock(
+ ContainerCommandRequestProto request, KeyValueContainer kvContainer) {
+
+ if (!request.hasListBlock()) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Malformed list block request. trace ID: {}",
+ request.getTraceID());
+ }
+ return malformedRequest(request);
+ }
+
+ List<BlockData> responseData;
+ List<ContainerProtos.BlockData> returnData = new ArrayList();
Review comment:
```suggestion
List<ContainerProtos.BlockData> returnData = new ArrayList<>();
```
--
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]
