From 46904bfe7391f6878aa32b5a48c65fb23f200c62 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 14 Dec 2018 16:13:58 +0000 Subject: [PATCH 1/3] Set timeouts on http requests to 3 minutes, up from the default of 20 seconds. --- .../java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java index 65dc8af0b9..457f4d59ce 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java @@ -130,6 +130,7 @@ public abstract class Request { HttpRequest request = Instance.httpRequestFactory.buildGetRequest( new GenericUrl(url) ); + setTimeouts(request); request(request); } catch (IOException e) { e.printStackTrace(); @@ -159,4 +160,11 @@ public abstract class Request { future = request.executeAsync(); } + private void setTimeouts(HttpRequest request) { + // timeouts are 20s by default + int threeMinutesInMs = 1000 * 60 * 3; + request.setConnectTimeout(threeMinutesInMs); + request.setReadTimeout(threeMinutesInMs); + } + } From 2195af88dd7ce1104c9b5df65c72b3e9c34b1b19 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 14 Dec 2018 16:34:48 +0000 Subject: [PATCH 2/3] Set timeouts on Post requests too --- .../main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java index 457f4d59ce..23373bc6b2 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java @@ -148,6 +148,7 @@ public abstract class Request { getPostBody().getBytes() ) ); + setTimeouts(request); request(request); } catch (IOException e) { e.printStackTrace(); From 40add6985f987a3ab4294f24e841d02548f6f24b Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 17 Dec 2018 09:39:19 +0000 Subject: [PATCH 3/3] Remove override of connect timeout --- .../main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java | 1 - 1 file changed, 1 deletion(-) diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java index 23373bc6b2..a7f994cce3 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java @@ -164,7 +164,6 @@ public abstract class Request { private void setTimeouts(HttpRequest request) { // timeouts are 20s by default int threeMinutesInMs = 1000 * 60 * 3; - request.setConnectTimeout(threeMinutesInMs); request.setReadTimeout(threeMinutesInMs); }