This is an automated email from the ASF dual-hosted git repository.
dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 15a3009 Use Stricter Retry Logic in ApacheBlockingContainerClient
(#4141)
15a3009 is described below
commit 15a30098b4829ba9ed8402d8055115fcfcd819d5
Author: James Dubee <[email protected]>
AuthorDate: Fri Jan 18 10:29:08 2019 -0500
Use Stricter Retry Logic in ApacheBlockingContainerClient (#4141)
* Use Stricter Retry Logic in ApacheBlockingContainerClient
* Scala Format
* Update Tests
* Simplify timeout calculation
* Remove max retry threshold
* Remove unneeded variable
* Remove unnecessary type conversion
* Add comment for sleep units
---
.../core/containerpool/ApacheBlockingContainerClient.scala | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/ApacheBlockingContainerClient.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/ApacheBlockingContainerClient.scala
index 2bd87a9..f56d1eb 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/ApacheBlockingContainerClient.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/ApacheBlockingContainerClient.scala
@@ -19,6 +19,7 @@ package org.apache.openwhisk.core.containerpool
import java.net.NoRouteToHostException
import java.nio.charset.StandardCharsets
+import java.time.Instant
import org.apache.commons.io.IOUtils
import org.apache.http.HttpHeaders
@@ -105,6 +106,8 @@ protected class ApacheBlockingContainerClient(hostname:
String,
// Annotation will make the compiler complain if no tail recursion is
possible
@tailrec private def execute(request: HttpRequestBase, timeout:
FiniteDuration, maxConcurrent: Int, retry: Boolean)(
implicit tid: TransactionId): Either[ContainerHttpError,
ContainerResponse] = {
+ val start = Instant.now
+
Try(connection.execute(request)).map { response =>
val containerResponse = Option(response.getEntity)
.map { entity =>
@@ -149,10 +152,9 @@ protected class ApacheBlockingContainerClient(hostname:
String,
} match {
case Success(response) => response
case Failure(t: RetryableConnectionError) if retry =>
- val sleepTime = 50.milliseconds
if (timeout > Duration.Zero) {
- Thread.sleep(sleepTime.toMillis)
- val newTimeout = timeout - sleepTime
+ Thread.sleep(50) // Sleep for 50 milliseconds
+ val newTimeout = timeout - (Instant.now.toEpochMilli -
start.toEpochMilli).milliseconds
execute(request, newTimeout, maxConcurrent, retry = true)
} else {
logging.warn(this, s"POST failed with $t - no retry because timeout
exceeded.")
