Ngone51 commented on a change in pull request #33460: URL: https://github.com/apache/spark/pull/33460#discussion_r675274990
########## File path: core/src/test/scala/org/apache/spark/util/collection/ExternalSorterSpillSuite.scala ########## @@ -0,0 +1,148 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util.collection + +import java.io.{File, IOException} + +import scala.collection.mutable.ArrayBuffer + +import org.mockito.ArgumentMatchers.{any, anyInt} +import org.mockito.Mockito.{mock, when} +import org.mockito.invocation.InvocationOnMock +import org.scalatest.BeforeAndAfterEach + +import org.apache.spark.{SparkConf, SparkEnv, SparkFunSuite, TaskContext} +import org.apache.spark.executor.ShuffleWriteMetrics +import org.apache.spark.internal.config +import org.apache.spark.memory.{TaskMemoryManager, TestMemoryManager} +import org.apache.spark.serializer.{KryoSerializer, SerializerInstance, SerializerManager} +import org.apache.spark.storage.{BlockId, BlockManager, DiskBlockManager, DiskBlockObjectWriter} +import org.apache.spark.util + +class ExternalSorterSpillSuite extends SparkFunSuite with BeforeAndAfterEach { + + private val spillFilesCreated = ArrayBuffer.empty[File] + + private var tempDir: File = _ + private var conf: SparkConf = _ + private var taskMemoryManager: TaskMemoryManager = _ + + private var blockManager: BlockManager = _ + private var diskBlockManager: DiskBlockManager = _ + private var taskContext: TaskContext = _ + + override protected def beforeEach(): Unit = { + tempDir = util.Utils.createTempDir(null, "test") + spillFilesCreated.clear() + + val env: SparkEnv = mock(classOf[SparkEnv]) + SparkEnv.set(env) + + conf = new SparkConf() + when(SparkEnv.get.conf).thenReturn(conf) + + val serializer = new KryoSerializer(conf) + when(SparkEnv.get.serializer).thenReturn(serializer) + + blockManager = mock(classOf[BlockManager]) + when(SparkEnv.get.blockManager).thenReturn(blockManager) + + val manager = new SerializerManager(serializer, conf) + when(blockManager.serializerManager).thenReturn(manager) + + diskBlockManager = mock(classOf[DiskBlockManager]) + when(blockManager.diskBlockManager).thenReturn(diskBlockManager) + + taskContext = mock(classOf[TaskContext]) + val memoryManager = new TestMemoryManager(conf) + taskMemoryManager = new TaskMemoryManager(memoryManager, 0) + when(taskContext.taskMemoryManager()).thenReturn(taskMemoryManager) + + when(diskBlockManager.createTempShuffleBlock()) + .thenAnswer((_: InvocationOnMock) => { + import org.apache.spark.storage.TempShuffleBlockId + import java.util.UUID + val blockId = TempShuffleBlockId(UUID.randomUUID) + val file = File.createTempFile("spillFile", ".spill", tempDir) + spillFilesCreated += file + (blockId, file) + }) + } + + override protected def afterEach(): Unit = { + util.Utils.deleteRecursively(tempDir) + SparkEnv.set(null) + + val leakedMemory = taskMemoryManager.cleanUpAllAllocatedMemory + if (leakedMemory != 0) { + fail("Test leaked " + leakedMemory + " bytes of managed memory") + } + } + + test("SPARK-36242 Spill File should not exists if writer close fails") { + // Prepare the data and ensure that the amount of data let the `spill()` method + // to enter the `objectsWritten > 0` branch + val writeSize = conf.get(config.SHUFFLE_SPILL_BATCH_SIZE) + 1 + val dataBuffer = new PartitionedPairBuffer[Int, Int] + (0 until writeSize.toInt).foreach(i => dataBuffer.insert(0, 0, i)) + + val externalSorter = new TestExternalSorter[Int, Int, Int](taskContext) + + // Mock the answer of `blockManager.getDiskWriter` and let the `close()` method of + // `DiskBlockObjectWriter` throw IOException. + val errorMessage = "Spill file close failed" + when(blockManager.getDiskWriter( + any(classOf[BlockId]), + any(classOf[File]), + any(classOf[SerializerInstance]), + anyInt(), + any(classOf[ShuffleWriteMetrics]) + )).thenAnswer((invocation: InvocationOnMock) => { + val args = invocation.getArguments + new DiskBlockObjectWriter( + args(1).asInstanceOf[File], + blockManager.serializerManager, + args(2).asInstanceOf[SerializerInstance], + args(3).asInstanceOf[Int], + false, + args(4).asInstanceOf[ShuffleWriteMetrics], + args(0).asInstanceOf[BlockId] + ) { + override def close(): Unit = throw new IOException(errorMessage) + } + }) + + val ioe = intercept[IOException] { + externalSorter.spill(dataBuffer) + } + + ioe.getMessage.equals(errorMessage) + // The `TempShuffleBlock` create by diskBlockManager + // will remain before SPARK-36242 + assert(!spillFilesCreated(0).exists()) Review comment: Thanks for the great work! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
