[ARVADOS] updated: 2.3.2-1-g5a1ba930d
Git user
git at public.arvados.org
Thu Dec 9 19:44:25 UTC 2021
Summary of changes:
doc/sdk/java-v2/index.html.textile.liquid | 6 +--
.../arvados/client/api/client/BaseApiClient.java | 8 +++-
.../org/arvados/client/config/ConfigProvider.java | 5 +++
.../client/config/ExternalConfigProvider.java | 44 +++++++++++++++++++++-
.../arvados/client/config/FileConfigProvider.java | 15 ++++++++
sdk/java-v2/src/main/resources/reference.conf | 7 ++++
sdk/java-v2/test-in-docker.sh | 33 +++-------------
7 files changed, 85 insertions(+), 33 deletions(-)
via 5a1ba930d6c3c61dfe2dbce127954c57f78bff1f (commit)
from e8a8cadb6035fa8c03589b9ab5ac1a382407c6a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 5a1ba930d6c3c61dfe2dbce127954c57f78bff1f
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri Oct 29 11:17:36 2021 -0400
Merge branch '18273-java-timeout' refs #18273
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/doc/sdk/java-v2/index.html.textile.liquid b/doc/sdk/java-v2/index.html.textile.liquid
index b3336d51d..ad9f0e1a9 100644
--- a/doc/sdk/java-v2/index.html.textile.liquid
+++ b/doc/sdk/java-v2/index.html.textile.liquid
@@ -32,7 +32,7 @@ application {
}
dependencies {
- api 'org.arvados:arvados-java-sdk:0.1.0'
+ api 'org.arvados:arvados-java-sdk:0.1.1'
}
</pre>
@@ -140,7 +140,7 @@ Dependencies:
$ <code class="userinput">git clone https://github.com/arvados/arvados.git</code>
$ <code class="userinput">cd arvados/sdk/java-v2</code>
$ <code class="userinput">gradle test</code>
-$ <code class="userinput">gradle jar</code>
+$ <code class="userinput">gradle jar -Pversion=0.1.1</code>
</pre>
-This will build the SDK and run all unit tests, then generate an Arvados Java sdk jar file in build/libs/arvados-java-2.0.0.jar
+This will build the SDK and run all unit tests, then generate an Arvados Java sdk jar file in build/libs/arvados-java-0.1.1.jar
</notextile>
diff --git a/sdk/java-v2/src/main/java/org/arvados/client/api/client/BaseApiClient.java b/sdk/java-v2/src/main/java/org/arvados/client/api/client/BaseApiClient.java
index a8d1a08cb..51f2f4a81 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/api/client/BaseApiClient.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/api/client/BaseApiClient.java
@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
+import java.util.concurrent.TimeUnit;
abstract class BaseApiClient {
@@ -34,7 +35,12 @@ abstract class BaseApiClient {
BaseApiClient(ConfigProvider config) {
this.config = config;
- this.client = OkHttpClientFactory.INSTANCE.create(config.isApiHostInsecure());
+ this.client = OkHttpClientFactory.INSTANCE.create(config.isApiHostInsecure())
+ .newBuilder()
+ .connectTimeout(config.getConnectTimeout(), TimeUnit.MILLISECONDS)
+ .readTimeout(config.getReadTimeout(), TimeUnit.MILLISECONDS)
+ .writeTimeout(config.getWriteTimeout(), TimeUnit.MILLISECONDS)
+ .build();
}
Request.Builder getRequestBuilder() {
diff --git a/sdk/java-v2/src/main/java/org/arvados/client/config/ConfigProvider.java b/sdk/java-v2/src/main/java/org/arvados/client/config/ConfigProvider.java
index c9a410931..116a46b3e 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/config/ConfigProvider.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/config/ConfigProvider.java
@@ -26,6 +26,11 @@ public interface ConfigProvider {
String getApiProtocol();
+ int getConnectTimeout();
+
+ int getReadTimeout();
+
+ int getWriteTimeout();
//FILE UPLOAD
int getFileSplitSize();
diff --git a/sdk/java-v2/src/main/java/org/arvados/client/config/ExternalConfigProvider.java b/sdk/java-v2/src/main/java/org/arvados/client/config/ExternalConfigProvider.java
index 17e06966f..d592b23ac 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/config/ExternalConfigProvider.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/config/ExternalConfigProvider.java
@@ -22,8 +22,35 @@ public class ExternalConfigProvider implements ConfigProvider {
private File fileSplitDirectory;
private int numberOfCopies;
private int numberOfRetries;
+ private int connectTimeout;
+ private int readTimeout;
+ private int writeTimeout;
+
+ ExternalConfigProvider(boolean apiHostInsecure, String keepWebHost, int keepWebPort, String apiHost, int apiPort,
+ String apiToken, String apiProtocol, int fileSplitSize, File fileSplitDirectory,
+ int numberOfCopies, int numberOfRetries)
+ {
+ this.apiHostInsecure = apiHostInsecure;
+ this.keepWebHost = keepWebHost;
+ this.keepWebPort = keepWebPort;
+ this.apiHost = apiHost;
+ this.apiPort = apiPort;
+ this.apiToken = apiToken;
+ this.apiProtocol = apiProtocol;
+ this.fileSplitSize = fileSplitSize;
+ this.fileSplitDirectory = fileSplitDirectory;
+ this.numberOfCopies = numberOfCopies;
+ this.numberOfRetries = numberOfRetries;
+ this.connectTimeout = 60000;
+ this.readTimeout = 60000;
+ this.writeTimeout = 60000;
+ }
- ExternalConfigProvider(boolean apiHostInsecure, String keepWebHost, int keepWebPort, String apiHost, int apiPort, String apiToken, String apiProtocol, int fileSplitSize, File fileSplitDirectory, int numberOfCopies, int numberOfRetries) {
+ ExternalConfigProvider(boolean apiHostInsecure, String keepWebHost, int keepWebPort, String apiHost, int apiPort,
+ String apiToken, String apiProtocol, int fileSplitSize, File fileSplitDirectory,
+ int numberOfCopies, int numberOfRetries,
+ int connectTimeout, int readTimeout, int writeTimeout)
+ {
this.apiHostInsecure = apiHostInsecure;
this.keepWebHost = keepWebHost;
this.keepWebPort = keepWebPort;
@@ -35,6 +62,9 @@ public class ExternalConfigProvider implements ConfigProvider {
this.fileSplitDirectory = fileSplitDirectory;
this.numberOfCopies = numberOfCopies;
this.numberOfRetries = numberOfRetries;
+ this.connectTimeout = connectTimeout;
+ this.readTimeout = readTimeout;
+ this.writeTimeout = writeTimeout;
}
public static ExternalConfigProviderBuilder builder() {
@@ -102,6 +132,18 @@ public class ExternalConfigProvider implements ConfigProvider {
return this.numberOfRetries;
}
+ public int getConnectTimeout() {
+ return this.connectTimeout;
+ }
+
+ public int getReadTimeout() {
+ return this.readTimeout;
+ }
+
+ public int getWriteTimeout() {
+ return this.writeTimeout;
+ }
+
public static class ExternalConfigProviderBuilder {
private boolean apiHostInsecure;
private String keepWebHost;
diff --git a/sdk/java-v2/src/main/java/org/arvados/client/config/FileConfigProvider.java b/sdk/java-v2/src/main/java/org/arvados/client/config/FileConfigProvider.java
index 589c3346b..99c1af810 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/config/FileConfigProvider.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/config/FileConfigProvider.java
@@ -104,4 +104,19 @@ public class FileConfigProvider implements ConfigProvider {
public String getIntegrationTestProjectUuid() {
return this.getString("integration-tests.project-uuid");
}
+
+ @Override
+ public int getConnectTimeout() {
+ return this.getInt("connectTimeout");
+ }
+
+ @Override
+ public int getReadTimeout() {
+ return this.getInt("readTimeout");
+ }
+
+ @Override
+ public int getWriteTimeout() {
+ return this.getInt("writeTimeout");
+ }
}
diff --git a/sdk/java-v2/src/main/resources/reference.conf b/sdk/java-v2/src/main/resources/reference.conf
index 3ff2bb0a9..8933e2bc6 100644
--- a/sdk/java-v2/src/main/resources/reference.conf
+++ b/sdk/java-v2/src/main/resources/reference.conf
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0 OR Apache-2.0
+#
# Arvados client default configuration
#
# Remarks:
@@ -20,4 +24,7 @@ arvados {
temp-dir = /tmp/file-split
copies = 2
retries = 0
+ connectTimeout = 60000
+ readTimeout = 60000
+ writeTimeout = 60000
}
diff --git a/sdk/java-v2/test-in-docker.sh b/sdk/java-v2/test-in-docker.sh
index c685005c0..7af3d32c4 100755
--- a/sdk/java-v2/test-in-docker.sh
+++ b/sdk/java-v2/test-in-docker.sh
@@ -6,12 +6,11 @@
#
set -e
-format_last_commit_here() {
- local format="$1"; shift
- TZ=UTC git log -n1 --first-parent "--format=format:$format" .
+commit_at_dir() {
+ git log -n1 --format=%H .
}
-version_from_git() {
+build_version() {
# Output the version being built, or if we're building a
# dev/prerelease, output a version number based on the git log for
# the current working directory.
@@ -20,29 +19,7 @@ version_from_git() {
return
fi
- local git_ts git_hash prefix
- if [[ -n "$1" ]] ; then
- prefix="$1"
- else
- prefix="0.1"
- fi
-
- declare $(format_last_commit_here "git_ts=%ct git_hash=%h")
- ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
- echo "$ARVADOS_BUILDING_VERSION"
-}
-
-nohash_version_from_git() {
- version_from_git $1 | cut -d. -f1-3
+ $WORKSPACE/build/version-at-commit.sh $(commit_at_dir)
}
-timestamp_from_git() {
- format_last_commit_here "%ct"
-}
-if [[ -n "$1" ]]; then
- build_version="$1"
-else
- build_version="$(version_from_git)"
-fi
-#UID=$(id -u) # UID is read-only on many systems
-exec docker run --rm --user $UID -v $PWD:$PWD -w $PWD gradle /bin/sh -c 'gradle clean && gradle test && gradle jar install '"$gradle_upload"
\ No newline at end of file
+exec docker run --rm --user $UID -v $PWD:$PWD -w $PWD gradle:5.3.1 /bin/sh -c 'gradle clean && gradle test && gradle jar install '"-Pversion=$(build_version) $gradle_upload"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list