Skip to content

HDDS-7243. Remove RequestFeatureValidator from echoRPC method which supports only ValidationCondition.OLDER_CLIENT_REQUESTS #4051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kerneltime merged 2 commits into from
Jan 6, 2023
Merged

HDDS-7243. Remove RequestFeatureValidator from echoRPC method which supports only ValidationCondition.OLDER_CLIENT_REQUESTS #4051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44d98d2
remove RequestFeatureValidator from echoRPC method; remove EchoRPC fr…
Dec 6, 2022
881c89c
remove unused class
Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
import org.apache.hadoop.ozone.om.request.volume.acl.OMVolumeAddAclRequest;
import org.apache.hadoop.ozone.om.request.volume.acl.OMVolumeRemoveAclRequest;
import org.apache.hadoop.ozone.om.request.volume.acl.OMVolumeSetAclRequest;
import org.apache.hadoop.ozone.om.request.OMEchoRPCRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OzoneObj.ObjectType;
Expand Down Expand Up @@ -290,8 +289,6 @@ public static OMClientRequest createClientRequest(OMRequest omRequest,
volumeName = keyArgs.getVolumeName();
bucketName = keyArgs.getBucketName();
break;
case EchoRPC:
return new OMEchoRPCRequest(omRequest);
default:
throw new IllegalStateException("Unrecognized write command " +
"type request" + cmdType);
Expand Down
41 changes: 0 additions & 41 deletions ...zone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMEchoRPCRequest.java
View file
Open in desktop

This file was deleted.

48 changes: 23 additions & 25 deletions ...-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
package org.apache.hadoop.ozone.protocolPB;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;

import com.google.protobuf.ByteString;
import com.google.protobuf.ServiceException;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
Expand Down Expand Up @@ -67,6 +67,8 @@
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CheckVolumeAccessRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CheckVolumeAccessResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.EchoRPCRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.EchoRPCResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.FinalizeUpgradeProgressRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.FinalizeUpgradeProgressResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.GetFileStatusRequest;
Expand Down Expand Up @@ -284,6 +286,10 @@ public OMResponse handleReadRequest(OMRequest request) {
responseBuilder.setGetKeyInfoResponse(
getKeyInfo(request.getGetKeyInfoRequest(), request.getVersion()));
break;
case EchoRPC:
EchoRPCResponse echoRPCResponse =
echoRPC(request.getEchoRPCRequest());
responseBuilder.setEchoRPCResponse(echoRPCResponse);
default:
responseBuilder.setSuccess(false);
responseBuilder.setMessage("Unrecognized Command Type: " + cmdType);
Expand Down Expand Up @@ -946,30 +952,6 @@ public static OMResponse disallowGetFileStatusWithECReplicationConfig(
return resp;
}

@RequestFeatureValidator(
conditions = ValidationCondition.OLDER_CLIENT_REQUESTS,
processingPhase = RequestProcessingPhase.POST_PROCESS,
requestType = Type.EchoRPC
)
public static OMResponse echoRPC(
OMRequest req, OMResponse resp, ValidationContext ctx)
throws ServiceException {
if (!resp.hasEchoRPCResponse()) {
return resp;
}
byte[] payloadBytes = new byte[0];
int payloadRespSize = Math.min(
req.getEchoRPCRequest().getPayloadSizeResp()
* RPC_PAYLOAD_MULTIPLICATION_FACTOR, MAX_SIZE_KB);
if (payloadRespSize > 0) {
payloadBytes = RandomUtils.nextBytes(payloadRespSize);
}
resp = resp.toBuilder()
.setMessage(new String(payloadBytes, StandardCharsets.UTF_8))
.clearEchoRPCResponse()
.build();
return resp;
}

@RequestFeatureValidator(
conditions = ValidationCondition.OLDER_CLIENT_REQUESTS,
Expand Down Expand Up @@ -1218,4 +1200,20 @@ private GetS3VolumeContextResponse getS3VolumeContext()
public OzoneManager getOzoneManager() {
return impl;
}

private EchoRPCResponse echoRPC(EchoRPCRequest req) {
EchoRPCResponse.Builder builder =
EchoRPCResponse.newBuilder();

byte[] payloadBytes = new byte[0];
int payloadRespSize = Math.min(
req.getPayloadSizeResp()
* RPC_PAYLOAD_MULTIPLICATION_FACTOR, MAX_SIZE_KB);
if (payloadRespSize > 0) {
payloadBytes = RandomUtils.nextBytes(payloadRespSize);
}
builder.setPayload(ByteString.copyFrom(payloadBytes));
return builder.build();
}

}