| commit | d48e72aa7bc012c85dfc2aac019ab61cfeea4a41 | [log] [tgz] |
|---|---|---|
| author | Philippe Suter <psuter@us.ibm.com> | Thu Sep 01 11:49:56 2016 -0400 |
| committer | Philippe Suter <psuter@us.ibm.com> | Thu Sep 01 11:49:56 2016 -0400 |
| tree | a2b61e47846dc4a9d2bfbef3cfa1bf42bcf3e32c | |
| parent | 043575a82441f1c03aa607a08f09d5d8e818d734 [diff] |
Tightens the timeout on a "safety" Await.
diff --git a/core/dispatcher/src/main/scala/whisk/core/container/WhiskContainer.scala b/core/dispatcher/src/main/scala/whisk/core/container/WhiskContainer.scala index 27912c9..50dde63 100644 --- a/core/dispatcher/src/main/scala/whisk/core/container/WhiskContainer.scala +++ b/core/dispatcher/src/main/scala/whisk/core/container/WhiskContainer.scala
@@ -135,7 +135,7 @@ // Should never timeout because the future has a built-in timeout. // Keeping a finite duration for safety. - Await.ready(f, timeout * 10) + Await.ready(f, timeout + 1.minute) val end = ContainerCounter.now()