Skip to content

[SPARK-32024][WEBUI][FOLLOWUP][2.4] Quick fix on test failure on missing when statement #29048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HeartSaVioR wants to merge 1 commit into from
Closed

[SPARK-32024][WEBUI][FOLLOWUP][2.4] Quick fix on test failure on missing when statement #29048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/deploy/history/HistoryServerDiskManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ private class HistoryServerDiskManager(
}
}

private def appStorePath(appId: String, attemptId: Option[String]): File = {
private[history] def appStorePath(appId: String, attemptId: Option[String]): File = {
val fileName = appId + attemptId.map("_" + _).getOrElse("") + ".ldb"
new File(appStoreDir, fileName)
}
Expand Down
6 changes: 6 additions & 0 deletions core/src/test/scala/org/apache/spark/deploy/history/HistoryServerDiskManagerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ class HistoryServerDiskManagerSuite extends SparkFunSuite with BeforeAndAfter {
val manager = mockManager()
val leaseA = manager.lease(2)
doReturn(3L).when(manager).sizeOf(meq(leaseA.tmpPath))
val dstPathA = manager.appStorePath("app1", None)
doReturn(3L).when(manager).sizeOf(meq(dstPathA))
val dstA = leaseA.commit("app1", None)
assert(manager.free() === 0)
assert(manager.committed() === 3)
Expand All @@ -181,6 +183,8 @@ class HistoryServerDiskManagerSuite extends SparkFunSuite with BeforeAndAfter {
val leaseB = manager1.lease(2)
assert(manager1.free() === 1)
doReturn(2L).when(manager1).sizeOf(meq(leaseB.tmpPath))
val dstPathB = manager.appStorePath("app2", None)
doReturn(2L).when(manager1).sizeOf(meq(dstPathB))
val dstB = leaseB.commit("app2", None)
assert(manager1.committed() === 2)
// Listing store tracks dstB only, dstA is evicted by "makeRoom()".
Expand All @@ -196,6 +200,8 @@ class HistoryServerDiskManagerSuite extends SparkFunSuite with BeforeAndAfter {
assert(manager2.free() === 0)
val leaseC = manager2.lease(2)
doReturn(2L).when(manager2).sizeOf(meq(leaseC.tmpPath))
val dstPathC = manager.appStorePath("app3", None)
doReturn(2L).when(manager2).sizeOf(meq(dstPathC))
val dstC = leaseC.commit("app3", None)
assert(manager2.free() === 1)
assert(manager2.committed() === 2)
Expand Down