aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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)