aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2013-06-26 08:49:58 -0700
committerPatrick Wendell <pwendell@gmail.com>2013-06-26 08:51:28 -0700
commit274193664ae13adbe5215f5dcc2be11e672557b6 (patch)
treec179816520ee42bc4a9e2395baeff5f52fde4bbf
parentb14ad509ba4c00d57bd4a52a7b70a18325064a7b (diff)
downloadspark-274193664ae13adbe5215f5dcc2be11e672557b6.tar.gz
spark-274193664ae13adbe5215f5dcc2be11e672557b6.tar.bz2
spark-274193664ae13adbe5215f5dcc2be11e672557b6.zip
Bumping timeouts
-rw-r--r--core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala4
-rw-r--r--core/src/main/scala/spark/deploy/master/ui/IndexPage.scala2
-rw-r--r--core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala4
3 files changed, 5 insertions, 5 deletions
diff --git a/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
index 9cb9c94e9f..fb2c803a91 100644
--- a/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
+++ b/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
@@ -22,7 +22,7 @@ private[spark] class ApplicationPage(parent: MasterWebUI) {
def renderJson(request: HttpServletRequest): JValue = {
val appId = request.getParameter("appId")
val stateFuture = (master ? RequestMasterState)(timeout).mapTo[MasterState]
- val state = Await.result(stateFuture, 3 seconds)
+ val state = Await.result(stateFuture, 30 seconds)
val app = state.activeApps.find(_.id == appId).getOrElse({
state.completedApps.find(_.id == appId).getOrElse(null)
})
@@ -33,7 +33,7 @@ private[spark] class ApplicationPage(parent: MasterWebUI) {
def render(request: HttpServletRequest): Seq[Node] = {
val appId = request.getParameter("appId")
val stateFuture = (master ? RequestMasterState)(timeout).mapTo[MasterState]
- val state = Await.result(stateFuture, 3 seconds)
+ val state = Await.result(stateFuture, 30 seconds)
val app = state.activeApps.find(_.id == appId).getOrElse({
state.completedApps.find(_.id == appId).getOrElse(null)
})
diff --git a/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
index 3c3679a4b0..4892f258e1 100644
--- a/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
@@ -20,7 +20,7 @@ private[spark] class IndexPage(parent: MasterWebUI) {
/** Index view listing applications and executors */
def render(request: HttpServletRequest): Seq[Node] = {
val stateFuture = (master ? RequestMasterState)(timeout).mapTo[MasterState]
- val state = Await.result(stateFuture, 3 seconds)
+ val state = Await.result(stateFuture, 30 seconds)
val workerHeaders = Seq("Id", "Address", "State", "Cores", "Memory")
val workers = state.workers.sortBy(_.id)
diff --git a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
index c1ca09fc97..e95a74a37f 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
@@ -21,13 +21,13 @@ private[spark] class IndexPage(parent: WorkerWebUI) {
def renderJson(request: HttpServletRequest): JValue = {
val stateFuture = (worker ? RequestWorkerState)(timeout).mapTo[WorkerState]
- val workerState = Await.result(stateFuture, 3 seconds)
+ val workerState = Await.result(stateFuture, 30 seconds)
JsonProtocol.writeWorkerState(workerState)
}
def render(request: HttpServletRequest): Seq[Node] = {
val stateFuture = (worker ? RequestWorkerState)(timeout).mapTo[WorkerState]
- val workerState = Await.result(stateFuture, 3 seconds)
+ val workerState = Await.result(stateFuture, 30 seconds)
val executorHeaders = Seq("ExecutorID", "Cores", "Memory", "Job Details", "Logs")
val runningExecutorTable =