adoroszlai commented on code in PR #6812:
URL: https://github.com/apache/ozone/pull/6812#discussion_r1641940101
##########
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java:
##########
@@ -490,12 +499,14 @@ public XceiverClientReply sendCommandAsync(
try (Scope ignored = GlobalTracer.get().activateSpan(span)) {
- ContainerCommandRequestProto finalPayload =
+ ContainerCommandRequestProto.Builder finalPayload =
Review Comment:
nit: `finalPayload` can be renamed to `builder`.
##########
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java:
##########
@@ -277,9 +278,14 @@ public ContainerCommandResponseProto sendCommand(
List<DatanodeDetails> datanodeList = pipeline.getNodes();
HashMap<DatanodeDetails, CompletableFuture<ContainerCommandResponseProto>>
futureHashMap = new HashMap<>();
+ ContainerCommandRequestProto.Builder builder =
ContainerCommandRequestProto.newBuilder(request);
+ if (!request.hasVersion()) {
+ builder.setVersion(ClientVersion.CURRENT.toProtoValue());
+ }
+ ContainerCommandRequestProto finalRequest = builder.build();
Review Comment:
Here we only conditionally need to create `newBuilder()` and then `build()`.
##########
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java:
##########
@@ -337,10 +343,13 @@ private XceiverClientReply sendCommandWithTraceIDAndRetry(
return TracingUtil.executeInNewSpan(spanName,
() -> {
- ContainerCommandRequestProto finalPayload =
+ ContainerCommandRequestProto.Builder finalPayload =
Review Comment:
nit: `finalPayload` can be renamed to `builder`.
##########
hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/TestBlockOutputStreamCorrectness.java:
##########
@@ -231,6 +232,11 @@ public Pipeline getPipeline() {
public XceiverClientReply sendCommandAsync(
ContainerCommandRequestProto request
) {
+ final ContainerCommandRequestProto.Builder finalRequest =
ContainerCommandRequestProto.newBuilder(request);
+ if (!request.hasVersion()) {
+ finalRequest.setVersion(ClientVersion.CURRENT.toProtoValue());
+ }
+ request = finalRequest.build();
Review Comment:
Here we only conditionally need to create `newBuilder()` and then `build()`.
##########
hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/TestBlockOutputStreamCorrectness.java:
##########
@@ -231,6 +232,11 @@ public Pipeline getPipeline() {
public XceiverClientReply sendCommandAsync(
ContainerCommandRequestProto request
) {
+ final ContainerCommandRequestProto.Builder finalRequest =
ContainerCommandRequestProto.newBuilder(request);
Review Comment:
nit: `finalRequest` can be renamed to `builder`.
##########
hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java:
##########
@@ -549,16 +555,15 @@ public static byte[] generateData(int length, boolean
random) {
* @return
*/
public static ContainerCommandRequestProto getDummyCommandRequestProto(
- ContainerProtos.Type cmdType) {
- final Builder builder =
- ContainerCommandRequestProto.newBuilder()
+ ClientVersion clientVersion, ContainerProtos.Type cmdType, int
replicaIndex) {
+ final Builder builder =
ContainerCommandRequestProto.newBuilder().setVersion(clientVersion.toProtoValue())
Review Comment:
nit:
```suggestion
final Builder builder = ContainerCommandRequestProto.newBuilder()
.setVersion(clientVersion.toProtoValue())
```
--
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: issues-unsubscr...@ozone.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@ozone.apache.org
For additional commands, e-mail: issues-h...@ozone.apache.org
