diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/AllStagesResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/AllStagesResource.scala index 63b2182cdbfac..d280934557945 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/AllStagesResource.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/AllStagesResource.scala @@ -104,7 +104,7 @@ object AllStagesResource { inputRecords = 0, //fix after SPARK-4874 outputBytes = stageUiData.outputBytes, outputRecords = 0, //fix after SPARK-4874 - shuffleReadBytes = stageUiData.shuffleReadBytes, + shuffleReadBytes = stageUiData.shuffleReadTotalBytes, shuffleReadRecords = 0, //fix after SPARK-4874 shuffleWriteBytes = stageUiData.shuffleWriteBytes, shuffleWriteRecords = 0, //fix after SPARK-4874 diff --git a/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala b/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala index ae38b2728152b..645edd7e0a47e 100644 --- a/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala +++ b/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala @@ -18,7 +18,7 @@ package org.apache.spark.deploy.history import java.io.{IOException, FileInputStream, FileWriter, File} import java.net.{HttpURLConnection, URL} -import javax.servlet.http.HttpServletResponse +import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import org.apache.commons.io.{FileUtils, IOUtils} @@ -154,7 +154,7 @@ class HistoryServerSuite extends FunSuite with BeforeAndAfter with Matchers with val ui = mock[SparkUI] val link = "/history/app1" val info = new ApplicationHistoryInfo("app1", "app1", 0, 2, 1, "xxx", true) - when(historyServer.getApplicationList()).thenReturn(Seq(info)) + when(historyServer.getApplicationList(true)).thenReturn(Seq(info)) when(ui.basePath).thenReturn(link) when(historyServer.getProviderConfig()).thenReturn(Map[String, String]()) val page = new HistoryPage(historyServer)