Skip to content

HBASE-30092 Avoid stringifying protobuf RPC parameters in task snapshots #8489

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

Open
Sigma-Ma wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −0
Open

HBASE-30092 Avoid stringifying protobuf RPC parameters in task snapshots #8489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredRPCHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@ private Map<String, Object> generateCallInfoMap() {
paramList.add(Bytes.toStringBinary((byte[]) param));
} else if (param instanceof Operation) {
paramList.add(((Operation) param).toMap());
} else if (param instanceof Message) {
// Do not stringify protobufs, as large requests can OOM the monitoring path.
paramList.add(param.getClass().getSimpleName());
} else {
paramList.add(param.toString());
}
Expand Down
20 changes: 20 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.apache.hbase.thirdparty.com.google.protobuf.ByteString;

import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;

@Tag(MiscTests.TAG)
@Tag(SmallTests.TAG)
public class TestTaskMonitor {
Expand Down Expand Up @@ -289,6 +294,21 @@ public void testClone() throws Exception {
assertNotEquals(clone.toJSON(), monitor.toJSON());
}

@Test
public void testCloneDoesNotStringifyProtobufParams() {
ClientProtos.ScanRequest request = ClientProtos.ScanRequest.newBuilder()
.setScan(ClientProtos.Scan.newBuilder().setFilter(FilterProtos.Filter.newBuilder()
.setName("large-filter").setSerializedFilter(ByteString.copyFrom(new byte[64 * 1024]))))
.build();
MonitoredRPCHandlerImpl monitor = new MonitoredRPCHandlerImpl("test");
monitor.setRPC("Scan", new Object[] { request }, 0);
monitor.setRPCPacket(request);

Map<String, Object> rpcCall = (Map<String, Object>) monitor.clone().toMap().get("rpcCall");
assertEquals(List.of("ScanRequest"), rpcCall.get("params"));
assertEquals((long) request.getSerializedSize(), rpcCall.get("packetlength"));
}

private class TestParam {
public String param = null;

Expand Down