This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 6ecdde1 Revert "[SPARK-36998][CORE] Handle concurrent eviction of
same application in SHS"
6ecdde1 is described below
commit 6ecdde189a61ea07125a3bddca6ec1ddd6a1c866
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Sun Nov 7 17:12:51 2021 -0800
Revert "[SPARK-36998][CORE] Handle concurrent eviction of same application
in SHS"
This reverts commit 248e07b49187bc7082e6cb2b0d9daa4b48ffe3cb.
---
.../deploy/history/HistoryServerDiskManager.scala | 10 ++------
.../history/HistoryServerDiskManagerSuite.scala | 30 +++-------------------
2 files changed, 5 insertions(+), 35 deletions(-)
diff --git
a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServerDiskManager.scala
b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServerDiskManager.scala
index 8a5b285..31f9d18 100644
---
a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServerDiskManager.scala
+++
b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServerDiskManager.scala
@@ -17,7 +17,7 @@
package org.apache.spark.deploy.history
-import java.io.{File, IOException}
+import java.io.File
import java.util.concurrent.atomic.AtomicLong
import scala.collection.JavaConverters._
@@ -210,13 +210,7 @@ private class HistoryServerDiskManager(
def committed(): Long = committedUsage.get()
private def deleteStore(path: File): Unit = {
- try {
- FileUtils.deleteDirectory(path)
- } catch {
- // Handle simultaneous eviction of the same app
- case e: IOException =>
- if (path.exists()) throw e
- }
+ FileUtils.deleteDirectory(path)
listing.delete(classOf[ApplicationStoreInfo], path.getAbsolutePath())
}
diff --git
a/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerDiskManagerSuite.scala
b/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerDiskManagerSuite.scala
index fecf905..9004e86 100644
---
a/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerDiskManagerSuite.scala
+++
b/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerDiskManagerSuite.scala
@@ -21,9 +21,8 @@ import java.io.File
import org.mockito.AdditionalAnswers
import org.mockito.ArgumentMatchers.{anyBoolean, anyLong, eq => meq}
-import org.mockito.Mockito.{doAnswer, spy, when}
-import org.scalatest.{BeforeAndAfter, PrivateMethodTester}
-import org.scalatestplus.mockito.MockitoSugar.mock
+import org.mockito.Mockito.{doAnswer, spy}
+import org.scalatest.BeforeAndAfter
import org.apache.spark.{SparkConf, SparkFunSuite}
import org.apache.spark.internal.config.History._
@@ -31,8 +30,7 @@ import org.apache.spark.status.KVUtils
import org.apache.spark.util.{ManualClock, Utils}
import org.apache.spark.util.kvstore.KVStore
-class HistoryServerDiskManagerSuite extends SparkFunSuite
- with PrivateMethodTester with BeforeAndAfter {
+class HistoryServerDiskManagerSuite extends SparkFunSuite with BeforeAndAfter {
private def doReturn(value: Any) = org.mockito.Mockito.doReturn(value,
Seq.empty: _*)
@@ -160,28 +158,6 @@ class HistoryServerDiskManagerSuite extends SparkFunSuite
assert(manager.approximateSize(50L, true) > 50L)
}
- test("SPARK-36998: Should be able to delete a store") {
- val manager = mockManager()
- val tempDir = Utils.createTempDir()
- tempDir.delete()
- Seq(true, false).foreach { exists =>
- val file = mock[File]
- when(file.exists()).thenReturn(true).thenReturn(true).thenReturn(exists)
- when(file.isDirectory).thenReturn(true)
- when(file.toPath).thenReturn(tempDir.toPath)
- when(file.getAbsolutePath).thenReturn(tempDir.getAbsolutePath)
- val deleteStore = PrivateMethod[Unit]('deleteStore)
- if (exists) {
- val m = intercept[Exception] {
- manager invokePrivate deleteStore(file)
- }.getMessage
- assert(m.contains("Unknown I/O error"))
- } else {
- manager invokePrivate deleteStore(file)
- }
- }
- }
-
test("SPARK-32024: update ApplicationStoreInfo.size during initializing") {
val manager = mockManager()
val leaseA = manager.lease(2)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
