From f4193f117b60e079234d791e16faefff4551b9ba Mon Sep 17 00:00:00 2001 From: Li Ning Date: Tue, 23 Feb 2021 17:50:09 -0800 Subject: [PATCH 1/5] set grpc server maxInboundMessageSize --- .../server/src/main/java/org/pytorch/serve/ModelServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java index ad16790fdb..dda2688fcf 100644 --- a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java +++ b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java @@ -388,7 +388,8 @@ private Server startGRPCServer(ConnectorType connectorType) throws IOException { new GRPCInterceptor())); if (configManager.isGRPCSSLEnabled()) { - s.useTransportSecurity( + s.maxInboundMessageSize(configManager.getMaxRequestSize()) + .useTransportSecurity( new File(configManager.getCertificateFile()), new File(configManager.getPrivateKeyFile())); } From 9d2251d83c68de80f793cf73535c281e6ad73e50 Mon Sep 17 00:00:00 2001 From: Li Ning Date: Tue, 23 Feb 2021 19:44:41 -0800 Subject: [PATCH 2/5] update ServerBuilder with NettyServerBuilder --- .../server/src/main/java/org/pytorch/serve/ModelServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java index dda2688fcf..5eb544e22d 100644 --- a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java +++ b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java @@ -3,6 +3,7 @@ import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.ServerInterceptors; +import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; @@ -381,7 +382,7 @@ public void startGRPCServers() throws IOException { private Server startGRPCServer(ConnectorType connectorType) throws IOException { ServerBuilder s = - ServerBuilder.forPort(configManager.getGRPCPort(connectorType)) + NettyServerBuilder.forPort(configManager.getGRPCPort(connectorType)) .addService( ServerInterceptors.intercept( GRPCServiceFactory.getgRPCService(connectorType), From f592e7ea975a9a5a8ac2362790edf0ed421cef44 Mon Sep 17 00:00:00 2001 From: Li Ning Date: Tue, 23 Feb 2021 20:14:43 -0800 Subject: [PATCH 3/5] update ServerBuilder with NettyServerBuilder --- .../server/src/main/java/org/pytorch/serve/ModelServer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java index 5eb544e22d..753933f83e 100644 --- a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java +++ b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java @@ -382,15 +382,15 @@ public void startGRPCServers() throws IOException { private Server startGRPCServer(ConnectorType connectorType) throws IOException { ServerBuilder s = - NettyServerBuilder.forPort(configManager.getGRPCPort(connectorType)) + NettyServerBuilder.maxInboundMessageSize(configManager.getMaxRequestSize()) + .forPort(configManager.getGRPCPort(connectorType)) .addService( ServerInterceptors.intercept( GRPCServiceFactory.getgRPCService(connectorType), new GRPCInterceptor())); if (configManager.isGRPCSSLEnabled()) { - s.maxInboundMessageSize(configManager.getMaxRequestSize()) - .useTransportSecurity( + s.useTransportSecurity( new File(configManager.getCertificateFile()), new File(configManager.getPrivateKeyFile())); } From 1f1ffbeca379c55fce9d4b6ca7b27a4baec5fff0 Mon Sep 17 00:00:00 2001 From: Li Ning Date: Tue, 23 Feb 2021 20:38:18 -0800 Subject: [PATCH 4/5] update ServerBuilder with NettyServerBuilder --- .../server/src/main/java/org/pytorch/serve/ModelServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java index 753933f83e..0ffe972c5a 100644 --- a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java +++ b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java @@ -382,8 +382,9 @@ public void startGRPCServers() throws IOException { private Server startGRPCServer(ConnectorType connectorType) throws IOException { ServerBuilder s = - NettyServerBuilder.maxInboundMessageSize(configManager.getMaxRequestSize()) + NettyServerBuilder .forPort(configManager.getGRPCPort(connectorType)) + .maxInboundMessageSize(configManager.getMaxRequestSize()) .addService( ServerInterceptors.intercept( GRPCServiceFactory.getgRPCService(connectorType), From 7501e298fc85edf2882516963d9698fee4eca0b2 Mon Sep 17 00:00:00 2001 From: Li Ning Date: Tue, 23 Feb 2021 21:07:40 -0800 Subject: [PATCH 5/5] fmt --- .../server/src/main/java/org/pytorch/serve/ModelServer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java index 0ffe972c5a..6531c0cea6 100644 --- a/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java +++ b/frontend/server/src/main/java/org/pytorch/serve/ModelServer.java @@ -382,8 +382,7 @@ public void startGRPCServers() throws IOException { private Server startGRPCServer(ConnectorType connectorType) throws IOException { ServerBuilder s = - NettyServerBuilder - .forPort(configManager.getGRPCPort(connectorType)) + NettyServerBuilder.forPort(configManager.getGRPCPort(connectorType)) .maxInboundMessageSize(configManager.getMaxRequestSize()) .addService( ServerInterceptors.intercept(