aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuciano Resende <lresende@apache.org>2017-01-26 18:56:53 -0800
committerLuciano Resende <lresende@apache.org>2017-01-26 18:56:53 -0800
commit0f3544a894a507b18cad857dabe68c1cd8b9215a (patch)
tree83f212296e4da1d05c32fa60f22cf681a8f6a584
parent4843923e5f84e714bb48fd9b253ecbf5ca6ebf28 (diff)
downloadtoree-gateway-0f3544a894a507b18cad857dabe68c1cd8b9215a.tar.gz
toree-gateway-0f3544a894a507b18cad857dabe68c1cd8b9215a.tar.bz2
toree-gateway-0f3544a894a507b18cad857dabe68c1cd8b9215a.zip
Increase eval timeout while we move that to config file
-rw-r--r--src/main/resources/toree-gateway.properties.template3
-rw-r--r--src/main/scala/org/apache/toree/gateway/ToreeGateway.scala2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/resources/toree-gateway.properties.template b/src/main/resources/toree-gateway.properties.template
index 68b0d3d..6f16e18 100644
--- a/src/main/resources/toree-gateway.properties.template
+++ b/src/main/resources/toree-gateway.properties.template
@@ -33,4 +33,5 @@ toree.username=
toree.password=
# location on the remote system where Toree is installed
toree.home=
-
+# timeout for code evaluation on toree, default = infinite
+#toree.eval-timeout=
diff --git a/src/main/scala/org/apache/toree/gateway/ToreeGateway.scala b/src/main/scala/org/apache/toree/gateway/ToreeGateway.scala
index 786a381..e251ee1 100644
--- a/src/main/scala/org/apache/toree/gateway/ToreeGateway.scala
+++ b/src/main/scala/org/apache/toree/gateway/ToreeGateway.scala
@@ -62,7 +62,7 @@ class ToreeGateway(client: SparkKernelClient) {
}
val ResponseTimeout = 1.seconds
- val EvalTimeout = 10.seconds
+ val EvalTimeout = Duration.Inf // 10.seconds
private def recoverTimeout[A](future: Future[A], timeout: FiniteDuration, default: A): Future[A] = try {
Await.ready(future, timeout)