Merge pull request #41582 from Thevakumar-Luheerathan/fix-timeout-issue

Introduce configurable timeouts for CentralClient
ballerina-platform · Nov 7, 2023 · 98d7a9d · 98d7a9d
2 parents 3e17306 + c003263
commit 98d7a9d
Show file tree

Hide file tree

Showing 14 changed files with 265 additions and 53 deletions.
diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/CommandUtil.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/CommandUtil.java
@@ -457,7 +457,9 @@ private static void pullPackageFromRemote(String orgName, String packageName, St
         CentralAPIClient client = new CentralAPIClient(RepoUtils.getRemoteRepoURL(),
                 initializeProxy(settings.getProxy()), settings.getProxy().username(),
                 settings.getProxy().password(),
-                getAccessTokenOfCLI(settings));
+                getAccessTokenOfCLI(settings), settings.getCentral().getConnectTimeout(),
+                settings.getCentral().getReadTimeout(), settings.getCentral().getWriteTimeout(),
+                settings.getCentral().getCallTimeout());
         try {
             client.pullPackage(orgName, packageName, version, destination, supportedPlatform,
                     RepoUtils.getBallerinaVersion(), false);

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/DeprecateCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/DeprecateCommand.java
@@ -171,7 +171,9 @@ private void deprecateInCentral(String packageInfo) {
             CentralAPIClient client = new CentralAPIClient(RepoUtils.getRemoteRepoURL(),
                     initializeProxy(settings.getProxy()), settings.getProxy().username(),
                     settings.getProxy().password(),
-                    getAccessTokenOfCLI(settings));
+                    getAccessTokenOfCLI(settings), settings.getCentral().getConnectTimeout(),
+                    settings.getCentral().getReadTimeout(), settings.getCentral().getWriteTimeout(),
+                    settings.getCentral().getCallTimeout());
             client.deprecatePackage(packageValue, deprecationMsg,
                     JvmTarget.JAVA_17.code(),
                     RepoUtils.getBallerinaVersion(), this.undoFlag);

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PullCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PullCommand.java
@@ -270,7 +270,10 @@ public void execute() {
         try {
             CentralAPIClient client = new CentralAPIClient(RepoUtils.getRemoteRepoURL(),
                     initializeProxy(settings.getProxy()), settings.getProxy().username(),
-                    settings.getProxy().password(), getAccessTokenOfCLI(settings));
+                    settings.getProxy().password(), getAccessTokenOfCLI(settings),
+                    settings.getCentral().getConnectTimeout(),
+                    settings.getCentral().getReadTimeout(), settings.getCentral().getWriteTimeout(),
+                    settings.getCentral().getCallTimeout());
             client.pullPackage(orgName, packageName, version, packagePathInBalaCache, supportedPlatform,
                     RepoUtils.getBallerinaVersion(), false);
             if (version.equals(Names.EMPTY.getValue())) {

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PushCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PushCommand.java
@@ -219,7 +219,10 @@ public void execute() {
                 }
                 CentralAPIClient client = new CentralAPIClient(RepoUtils.getRemoteRepoURL(),
                         initializeProxy(settings.getProxy()), settings.getProxy().username(),
-                        settings.getProxy().password(), getAccessTokenOfCLI(settings));
+                        settings.getProxy().password(), getAccessTokenOfCLI(settings),
+                        settings.getCentral().getConnectTimeout(),
+                        settings.getCentral().getReadTimeout(), settings.getCentral().getWriteTimeout(),
+                        settings.getCentral().getCallTimeout());
                 if (balaPath == null) {
                     pushPackage(project, client);
                 } else {

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/SearchCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/SearchCommand.java
@@ -144,7 +144,11 @@ private void searchInCentral(String query) {
                                                            initializeProxy(settings.getProxy()),
                                                             settings.getProxy().username(),
                                                             settings.getProxy().password(),
-                                                                getAccessTokenOfCLI(settings));
+                                                                getAccessTokenOfCLI(settings),
+                                                            settings.getCentral().getConnectTimeout(),
+                                                            settings.getCentral().getReadTimeout(),
+                                                            settings.getCentral().getWriteTimeout(),
+                                                            settings.getCentral().getCallTimeout());
             boolean foundSearch = false;
             String supportedPlatform = Arrays.stream(JvmTarget.values())
                     .map(target -> target.code())

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/ToolCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/ToolCommand.java
@@ -442,7 +442,10 @@ private void pullToolFromCentral(String supportedPlatform, Path balaCacheDirPath
         System.setProperty(CentralClientConstants.ENABLE_OUTPUT_STREAM, "true");
         CentralAPIClient client = new CentralAPIClient(RepoUtils.getRemoteRepoURL(),
                 initializeProxy(settings.getProxy()), settings.getProxy().username(),
-                settings.getProxy().password(), getAccessTokenOfCLI(settings));
+                settings.getProxy().password(), getAccessTokenOfCLI(settings),
+                settings.getCentral().getConnectTimeout(),
+                settings.getCentral().getReadTimeout(), settings.getCentral().getWriteTimeout(),
+                settings.getCentral().getCallTimeout());
         String[] toolInfo = client.pullTool(toolId, version, balaCacheDirPath, supportedPlatform,
                 RepoUtils.getBallerinaVersion(), false);
         boolean isPulled = Boolean.parseBoolean(toolInfo[0]);
@@ -574,7 +577,10 @@ private void searchToolsInCentral(String keyword) {
             }
             CentralAPIClient client = new CentralAPIClient(RepoUtils.getRemoteRepoURL(),
                     initializeProxy(settings.getProxy()), settings.getProxy().username(),
-                    settings.getProxy().password(), getAccessTokenOfCLI(settings));
+                    settings.getProxy().password(), getAccessTokenOfCLI(settings),
+                    settings.getCentral().getConnectTimeout(),
+                    settings.getCentral().getReadTimeout(), settings.getCentral().getWriteTimeout(),
+                    settings.getCentral().getCallTimeout());
             boolean foundTools = false;
             String supportedPlatform = Arrays.stream(JvmTarget.values())
                     .map(JvmTarget::code)
@@ -726,7 +732,10 @@ private String getLatestVersionForUpdateCommand(String supportedPlatforms, BalTo
         System.setProperty(CentralClientConstants.ENABLE_OUTPUT_STREAM, "true");
         CentralAPIClient client = new CentralAPIClient(RepoUtils.getRemoteRepoURL(),
                 initializeProxy(settings.getProxy()), settings.getProxy().username(),
-                settings.getProxy().password(), getAccessTokenOfCLI(settings));
+                settings.getProxy().password(), getAccessTokenOfCLI(settings),
+                settings.getCentral().getConnectTimeout(),
+                settings.getCentral().getReadTimeout(), settings.getCentral().getWriteTimeout(),
+                settings.getCentral().getCallTimeout());
         List<String> versions = client.getPackageVersions(tool.org(), tool.name(), supportedPlatforms,
                 RepoUtils.getBallerinaVersion());
         return getLatestVersion(versions, tool.version());