Skip to content

HDDS-7243. Remove POST_PROCESSOR from OzoneManagerRequestHandler echoRPC method #3767

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

Closed
DaveTeng0 wants to merge 2 commits into from
Closed

HDDS-7243. Remove POST_PROCESSOR from OzoneManagerRequestHandler echoRPC method #3767

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
3151be1
Remove POST_PROCESSOR from OzoneManagerRequestHandler echoRPC method
Sep 20, 2022
76afef0
fix method signature
Sep 20, 2022
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
13 changes: 0 additions & 13 deletions ...-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PrepareStatusResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PrepareStatusResponse.PrepareStatus;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CancelPrepareResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.EchoRPCResponse;
import org.apache.hadoop.ozone.security.OzoneDelegationTokenSelector;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages;
Expand Down Expand Up @@ -910,16 +909,4 @@ default CancelPrepareResponse cancelOzoneManagerPrepare() throws IOException {
return CancelPrepareResponse.newBuilder().build();
}

/**
* Send RPC request with or without payload to OM
Copy link
Contributor

@kerneltime kerneltime Sep 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we need to drop this from the OM Protocol?

* to benchmark RPC communication performance.
* @param payloadReq payload in request.
* @param payloadSizeResp payload size of response.
* @throws IOException if there is error in the RPC communication.
* @return EchoRPCResponse.
*/
EchoRPCResponse echoRPCReq(byte[] payloadReq,
int payloadSizeResp)
throws IOException;

}
1 change: 0 additions & 1 deletion ...ava/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,6 @@ public CancelPrepareResponse cancelOzoneManagerPrepare() throws IOException {
return handleError(submitRequest(omRequest)).getCancelPrepareResponse();
}

@Override
public EchoRPCResponse echoRPCReq(byte[] payloadReq,
int payloadSizeResp)
throws IOException {
Expand Down
8 changes: 0 additions & 8 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ServicePort;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ExtendedUserAccessIdInfo;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.TenantState;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.EchoRPCResponse;
import org.apache.hadoop.ozone.protocolPB.OMInterServiceProtocolServerSideImpl;
import org.apache.hadoop.ozone.protocolPB.OMAdminProtocolServerSideImpl;
import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos.PersistedUserVolumeInfo;
Expand Down Expand Up @@ -4454,13 +4453,6 @@ public boolean isOmRpcServerRunning() {
return isOmRpcServerRunning;
}

@Override
public EchoRPCResponse echoRPCReq(byte[] payloadReq,
int payloadSizeResp)
throws IOException {
return null;
}

/**
* Write down Layout version of a finalized feature to DB on finalization.
* @param lvm OMLayoutVersionManager
Expand Down
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
47 changes: 21 additions & 26 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 @@ -106,6 +106,8 @@
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.TenantListUserRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.TenantListUserResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.EchoRPCResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.EchoRPCRequest;
import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;

import com.google.common.collect.Lists;
Expand Down Expand Up @@ -277,6 +279,10 @@ public OMResponse handleReadRequest(OMRequest request) {
request.getTenantListUserRequest());
responseBuilder.setTenantListUserResponse(listUserResponse);
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 @@ -921,31 +927,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,
processingPhase = RequestProcessingPhase.POST_PROCESS,
Expand Down Expand Up @@ -1195,4 +1176,18 @@ private GetS3VolumeContextResponse getS3VolumeContext()
public OzoneManager getOzoneManager() {
return impl;
}

private EchoRPCResponse echoRPC(EchoRPCRequest request)
throws IOException {
byte[] payloadBytes = new byte[0];
int payloadRespSize = request.getPayloadSizeResp();
if (payloadRespSize > 0) {
payloadBytes = RandomUtils.nextBytes(payloadRespSize);
}

return EchoRPCResponse.newBuilder()
.setPayload(ByteString.copyFrom(payloadBytes))
.build();
}

}