Display user-friendly error messages

prabeesh · Jul 19, 2015 · bad52eb · bad52eb
1 parent 410586b
commit bad52eb
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/core/src/main/scala/org/apache/spark/ui/PagedTable.scala b/core/src/main/scala/org/apache/spark/ui/PagedTable.scala
@@ -35,8 +35,10 @@ private[ui] abstract class PagedDataSource[T](page: Int, pageSize: Int) {
   def pageData: PageData[T] = {
     val dataSize = data.size
     val totalPages = (dataSize + pageSize - 1) / pageSize
-    require(page > 0, "page must be positive")
-    require(page <= totalPages, s"page must not exceed $totalPages")
+    if (page <= 0 || page > totalPages) {
+      throw new IllegalArgumentException(
+        s"Page $page is out of range. Please select a page number between 1 and $totalPages.")
+    }
     val from = (page - 1) * pageSize
     val to = dataSize.min(page * pageSize)
     PageData(page, totalPages, data.slice(from, to))

diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -242,22 +242,28 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
         accumulables.values.toSeq)
 
       val currentTime = System.currentTimeMillis()
-      val taskTable = new TaskPagedTable(
-        UIUtils.prependBaseUri(parent.basePath) +
-          s"/stages/stage?id=${stageId}&attempt=${stageAttemptId}",
-        tasks,
-        hasAccumulators,
-        stageData.hasInput,
-        stageData.hasOutput,
-        stageData.hasShuffleRead,
-        stageData.hasShuffleWrite,
-        stageData.hasBytesSpilled,
-        currentTime,
-        page = taskPage,
-        pageSize = 100, // Show 100 tasks at most in the table
-        sortColumn = taskSortColumn,
-        desc = taskSortDesc
-      )
+      val (taskTable, taskTableHTML) = try {
+        val _taskTable = new TaskPagedTable(
+          UIUtils.prependBaseUri(parent.basePath) +
+            s"/stages/stage?id=${stageId}&attempt=${stageAttemptId}",
+          tasks,
+          hasAccumulators,
+          stageData.hasInput,
+          stageData.hasOutput,
+          stageData.hasShuffleRead,
+          stageData.hasShuffleWrite,
+          stageData.hasBytesSpilled,
+          currentTime,
+          page = taskPage,
+          pageSize = 100, // Show 100 tasks at most in the table
+          sortColumn = taskSortColumn,
+          desc = taskSortDesc
+        )
+        (_taskTable, _taskTable.table)
+      } catch {
+        case e: IllegalArgumentException =>
+          (null, <div>{e.getMessage}</div>)
+      }
 
       val jsForScrollingDownToTaskTable =
         <script>
@@ -274,7 +280,8 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
           }
         </script>
 
-      val taskIdsInPage = taskTable.dataSource.pageData.data.map(_.taskId).toSet
+      val taskIdsInPage = if (taskTable == null) Set.empty[Long]
+        else taskTable.dataSource.pageData.data.map(_.taskId).toSet
       // Excludes tasks which failed and have incomplete metrics
       val validTasks = tasks.filter(t => t.taskInfo.status == "SUCCESS" && t.taskMetrics.isDefined)
 
@@ -505,7 +512,7 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
         <div>{summaryTable.getOrElse("No tasks have reported metrics yet.")}</div> ++
         <h4>Aggregated Metrics by Executor</h4> ++ executorTable.toNodeSeq ++
         maybeAccumulableTable ++
-        <h4 id="tasks-section">Tasks</h4> ++ taskTable.table ++ jsForScrollingDownToTaskTable
+        <h4 id="tasks-section">Tasks</h4> ++ taskTableHTML ++ jsForScrollingDownToTaskTable
       UIUtils.headerSparkPage(stageHeader, content, parent, showVisualization = true)
     }
   }

diff --git a/core/src/test/scala/org/apache/spark/ui/PagedTableSuite.scala b/core/src/test/scala/org/apache/spark/ui/PagedTableSuite.scala
@@ -45,15 +45,16 @@ class PagedDataSourceSuite extends SparkFunSuite {
     val e1 = intercept[IllegalArgumentException] {
       dataSource4.pageData
     }
-    assert(e1.getMessage === "requirement failed: page must not exceed 3")
+    assert(e1.getMessage === "Page 4 is out of range. Please select a page number between 1 and 3.")
 
     val dataSource5 = new PagedDataSource[Int](page = 0, pageSize = 2) {
       override protected val data: Seq[Int] = (1 to 5)
     }
     val e2 = intercept[IllegalArgumentException] {
       dataSource5.pageData
     }
-    assert(e2.getMessage === "requirement failed: page must be positive")
+    assert(e2.getMessage === "Page 0 is out of range. Please select a page number between 1 and 3.")
+
   }
 }