diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index a29dd5980..8695920be 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "grpc" -version = "1.14.3" +version = "1.14.4" distribution = "2201.12.0" authors = ["Ballerina"] keywords = ["network", "grpc", "protobuf", "server-streaming", "client-streaming", "bidirectional-streaming"] @@ -16,11 +16,11 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "grpc-native" -version = "1.14.3" -path = "../native/build/libs/grpc-native-1.14.3.jar" +version = "1.14.4" +path = "../native/build/libs/grpc-native-1.14.4-SNAPSHOT.jar" [[platform.java21.dependency]] -path = "../test-utils/build/libs/grpc-test-utils-1.14.3.jar" +path = "../test-utils/build/libs/grpc-test-utils-1.14.4-SNAPSHOT.jar" scope = "testOnly" [[platform.java21.dependency]] diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index cf89364ab..2ce8da1d8 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "grpc-compiler-plugin" class = "io.ballerina.stdlib.grpc.plugin.GrpcCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.14.3.jar" +path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.14.4-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index a17315257..1bc8dc27a 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -44,7 +44,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.9.2" +version = "2.9.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -78,7 +78,7 @@ dependencies = [ [[package]] org = "ballerina" name = "grpc" -version = "1.14.3" +version = "1.14.4" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "crypto"}, @@ -302,7 +302,7 @@ modules = [ [[package]] org = "ballerina" name = "observe" -version = "1.5.0" +version = "1.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] diff --git a/native/src/main/java/io/ballerina/stdlib/grpc/GrpcUtil.java b/native/src/main/java/io/ballerina/stdlib/grpc/GrpcUtil.java index e51e311e0..c2d495a2d 100644 --- a/native/src/main/java/io/ballerina/stdlib/grpc/GrpcUtil.java +++ b/native/src/main/java/io/ballerina/stdlib/grpc/GrpcUtil.java @@ -80,6 +80,9 @@ private GrpcUtil() { private static final Logger log = LoggerFactory.getLogger(GrpcUtil.class); + private static final int BUFFER_SIZE = 1048576; + private static final int BACK_LOG = 100; + public static ConnectionManager getConnectionManager(BMap poolStruct) { ConnectionManager poolManager = (ConnectionManager) poolStruct.getNativeData(CONNECTION_MANAGER); @@ -233,6 +236,8 @@ public static ListenerConfiguration getListenerConfig(long port, BMap endpointCo listenerConfiguration.setServerHeader(getServerName()); } + setSocketConfig(listenerConfiguration); + if (sslConfig != null) { return setSslConfig(sslConfig, listenerConfiguration); } @@ -246,6 +251,12 @@ public static ListenerConfiguration getListenerConfig(long port, BMap endpointCo return listenerConfiguration; } + private static void setSocketConfig(ListenerConfiguration listenerConfiguration) { + listenerConfiguration.setReceiveBufferSize(BUFFER_SIZE); + listenerConfiguration.setSendBufferSize(BUFFER_SIZE); + listenerConfiguration.setSoBackLog(BACK_LOG); + } + private static String getServerName() { String userAgent; diff --git a/native/src/main/java/io/ballerina/stdlib/grpc/nativeimpl/serviceendpoint/FunctionUtils.java b/native/src/main/java/io/ballerina/stdlib/grpc/nativeimpl/serviceendpoint/FunctionUtils.java index 6ac0a4f99..dc8ce3eb0 100644 --- a/native/src/main/java/io/ballerina/stdlib/grpc/nativeimpl/serviceendpoint/FunctionUtils.java +++ b/native/src/main/java/io/ballerina/stdlib/grpc/nativeimpl/serviceendpoint/FunctionUtils.java @@ -152,7 +152,7 @@ private static Object startServerConnector(BObject listener, ServicesRegistry se try { serverConnectorFuture.sync(); } catch (Exception ex) { - return MessageUtils.getConnectorError(new StatusRuntimeException(Status + throw MessageUtils.getConnectorError(new StatusRuntimeException(Status .fromCode(Status.Code.INTERNAL.toStatus().getCode()).withDescription( "Failed to start server connector '" + serverConnector.getConnectorID() + "'. " + ex.getMessage()))); @@ -192,9 +192,15 @@ public static Object externStart(BObject listener) { */ public static Object gracefulStop(BObject serverEndpoint) { - getServerConnector(serverEndpoint).stop(); - serverEndpoint.addNativeData(GrpcConstants.CONNECTOR_STARTED, false); - return null; + try { + getServerConnector(serverEndpoint).stop(); + serverEndpoint.addNativeData(GrpcConstants.CONNECTOR_STARTED, false); + return null; + } catch (Exception ex) { + return MessageUtils.getConnectorError(new StatusRuntimeException(Status + .fromCode(Status.Code.INTERNAL.toStatus().getCode()).withDescription( + "Failed to stop server connector gracefully. " + ex.getMessage()))); + } } /** @@ -204,9 +210,16 @@ public static Object gracefulStop(BObject serverEndpoint) { * @return Error if there is an error while stopping the server, else returns nil. */ public static Object immediateStop(BObject serverEndpoint) { - getServerConnector(serverEndpoint).immediateStop(); - serverEndpoint.addNativeData(GrpcConstants.CONNECTOR_STARTED, false); - return null; + + try { + getServerConnector(serverEndpoint).immediateStop(); + serverEndpoint.addNativeData(GrpcConstants.CONNECTOR_STARTED, false); + return null; + } catch (Exception ex) { + return MessageUtils.getConnectorError(new StatusRuntimeException(Status + .fromCode(Status.Code.INTERNAL.toStatus().getCode()).withDescription( + "Failed to stop server connector immediately. " + ex.getMessage()))); + } } public static Object nextResult(Environment env, BObject streamIterator) {