grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netty: Respect io.netty.allocator.type="unpooled" when getting Netty Allocator (#10543) 

Fixes #10292
This commit is contained in:
Larry Safran 2023-09-07 14:58:46 -07:00 committed by GitHub
parent d4a163461a
commit 878e301a5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netty/src/main/java/io/grpc/netty/Utils.java
View File

@ -37,6 +37,7 @@ import io.grpc.netty.GrpcHttp2HeadersUtils.GrpcHttp2InboundHeaders;
import io.grpc.netty.NettySocketSupport.NativeSocketOptions; import io.grpc.netty.NettySocketSupport.NativeSocketOptions;
import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.PooledByteBufAllocator;
import io.netty.buffer.UnpooledByteBufAllocator;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelConfig; import io.netty.channel.ChannelConfig;
import io.netty.channel.ChannelFactory; import io.netty.channel.ChannelFactory;
@ -60,6 +61,7 @@ import java.io.IOException;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
import java.nio.channels.UnresolvedAddressException; import java.nio.channels.UnresolvedAddressException;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -135,6 +137,13 @@ class Utils {
public static ByteBufAllocator getByteBufAllocator(boolean forceHeapBuffer) { public static ByteBufAllocator getByteBufAllocator(boolean forceHeapBuffer) {
if (Boolean.parseBoolean( if (Boolean.parseBoolean(
System.getProperty("io.grpc.netty.useCustomAllocator", "true"))) { System.getProperty("io.grpc.netty.useCustomAllocator", "true"))) {
String allocType = System.getProperty("io.netty.allocator.type", "pooled");
if (allocType.toLowerCase(Locale.ROOT).equals("unpooled")) {
logger.log(Level.FINE, "Using unpooled allocator");
return UnpooledByteBufAllocator.DEFAULT;
}
boolean defaultPreferDirect = PooledByteBufAllocator.defaultPreferDirect(); boolean defaultPreferDirect = PooledByteBufAllocator.defaultPreferDirect();
logger.log( logger.log(
Level.FINE, Level.FINE,

17
netty/src/test/java/io/grpc/netty/UtilsTest.java
View File

@ -19,6 +19,7 @@ package io.grpc.netty;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.TruthJUnit.assume; import static com.google.common.truth.TruthJUnit.assume;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;
@ -28,6 +29,7 @@ import io.grpc.InternalChannelz.SocketOptions;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.internal.GrpcUtil; import io.grpc.internal.GrpcUtil;
import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelFactory; import io.netty.channel.ChannelFactory;
import io.netty.channel.ChannelOption; import io.netty.channel.ChannelOption;
@ -70,6 +72,21 @@ public class UtilsTest {
assertStatusEquals(Status.UNKNOWN.withCause(t), Utils.statusFromThrowable(t)); assertStatusEquals(Status.UNKNOWN.withCause(t), Utils.statusFromThrowable(t));
} }
@Test
public void testGetBufferAllocator() {
ByteBufAllocator heapAllocator = Utils.getByteBufAllocator(true);
ByteBufAllocator directAllocator = Utils.getByteBufAllocator(false);
assertNotEquals(heapAllocator, directAllocator);
System.setProperty("io.netty.allocator.type", "unpooled");
ByteBufAllocator unpooled1 = Utils.getByteBufAllocator(false);
assertThat(unpooled1.getClass().getName()).isNotEqualTo("UnpooledByteBufAllocator");
System.setProperty("io.netty.allocator.type", "pooled");
ByteBufAllocator unpooled2 = Utils.getByteBufAllocator(false);
assertEquals(directAllocator, unpooled2);
}
@Test @Test
public void convertClientHeaders_sanitizes() { public void convertClientHeaders_sanitizes() {
Metadata metaData = new Metadata(); Metadata metaData = new Metadata();