Merge pull request #1527 from dilanSachi/error-hang

Fix client getting hanged due to invalid retry configuraiton handling logic
ballerina-platform · Jan 22, 2024 · 5668d06 · 5668d06
2 parents 5a537e9 + 0c13afe
commit 5668d06
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/ballerina-tests/tests/22_retry_client.bal b/ballerina-tests/tests/22_retry_client.bal
@@ -19,16 +19,16 @@ import ballerina/test;
 
 grpc:RetryConfiguration retryConfig = {
     retryCount: 3,
-    interval: 0.002,
-    maxInterval: 0.01,
+    interval: 2,
+    maxInterval: 10,
     backoffFactor: 2,
     errorTypes: [grpc:UnavailableError, grpc:InternalError]
 };
 
 grpc:RetryConfiguration failingRetryConfig = {
     retryCount: 2,
-    interval: 0.002,
-    maxInterval: 0.01,
+    interval: 2,
+    maxInterval: 10,
     backoffFactor: 2,
     errorTypes: [grpc:UnavailableError, grpc:InternalError]
 };

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "grpc"
-version = "1.10.4"
+version = "1.10.5"
 distribution = "2201.8.0"
 authors = ["Ballerina"]
 keywords = ["network", "grpc", "protobuf", "server-streaming", "client-streaming", "bidirectional-streaming"]
@@ -16,11 +16,11 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "grpc-native"
-version = "1.10.4"
-path = "../native/build/libs/grpc-native-1.10.4.jar"
+version = "1.10.5"
+path = "../native/build/libs/grpc-native-1.10.5-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
-path = "../test-utils/build/libs/grpc-test-utils-1.10.4.jar"
+path = "../test-utils/build/libs/grpc-test-utils-1.10.5-SNAPSHOT.jar"
 scope = "testOnly"
 
 [[platform.java17.dependency]]

diff --git 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.10.4.jar"
+path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.10.5-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -25,7 +25,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "cache"
-version = "3.7.0"
+version = "3.7.1"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -68,7 +68,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "grpc"
-version = "1.10.4"
+version = "1.10.5"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "crypto"},
@@ -94,7 +94,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.10.3"
+version = "2.10.5"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -289,7 +289,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]

diff --git a/ballerina/client_endpoint.bal b/ballerina/client_endpoint.bal
@@ -138,8 +138,8 @@ isolated function retryBlockingExecute(Client grpcClient, string methodID, anyda
 headers, RetryConfiguration retryConfig) returns ([anydata, map<string|string[]>]|Error) {
     int currentRetryCount = 0;
     int retryCount = retryConfig.retryCount;
-    decimal interval = retryConfig.interval * 1000;
-    decimal maxInterval = retryConfig.maxInterval * 1000;
+    decimal interval = retryConfig.interval;
+    decimal maxInterval = retryConfig.maxInterval;
     decimal backoffFactor = retryConfig.backoffFactor;
     ErrorType[] errorTypes = retryConfig.errorTypes;
     error? cause = ();
@@ -155,7 +155,9 @@ headers, RetryConfiguration retryConfig) returns ([anydata, map<string|string[]>
                 cause = result;
             }
         }
-        runtime:sleep(interval);
+        if currentRetryCount < retryCount {
+            runtime:sleep(interval);
+        }
         decimal newInterval = interval * backoffFactor;
         interval = (newInterval > maxInterval) ? maxInterval : newInterval;
         currentRetryCount += 1;

diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,10 @@ This file contains all the notable changes done to the Ballerina gRPC package th
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Fixed
+- [Fixed the way of handling `grpc:RetryConfiguration`](https://github.com/ballerina-platform/ballerina-library/issues/5970)
+
 ## [1.10.4] - 2024-01-04
 ### Fixed
 - [Fixed `grpc:ClientConfiguration` getting overwritten when mutliple clients are present](https://github.com/ballerina-platform/ballerina-library/issues/5892)