Skip to content

Use assume method instead of try ... catch ... statement #1

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
dongjoon-hyun wants to merge 1 commit into from
Closed

Use assume method instead of try ... catch ... statement #1

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
48 changes: 20 additions & 28 deletions core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,35 +155,27 @@ class DiskBlockManagerSuite extends SparkFunSuite with BeforeAndAfterEach with B
conf.set("spark.shuffle.service.enabled", "true")
conf.set("spark.shuffle.service.removeShuffle", "false")
val posix = POSIXFactory.getPOSIX
assume(posix.isNative, "Skipping test for SPARK-37618, native posix support not found")

if (posix.isNative) {
val oldUmask = getAndSetUmask(posix, "077")
try {
val diskBlockManager = new DiskBlockManager(conf, deleteFilesOnStop = true,
isDriver = false)
val blockId = new TestBlockId("test")
val newFile = diskBlockManager.getFile(blockId)
val parentDir = newFile.getParentFile()
assert(parentDir.exists && parentDir.isDirectory)
val permission = Files.getPosixFilePermissions(parentDir.toPath)
assert(!permission.contains(PosixFilePermission.GROUP_WRITE))

assert(parentDir.delete())

conf.set("spark.shuffle.service.removeShuffle", "true")
val diskBlockManager2 = new DiskBlockManager(conf, deleteFilesOnStop = true,
isDriver = false)
val newFile2 = diskBlockManager2.getFile(blockId)
val parentDir2 = newFile2.getParentFile()
assert(parentDir2.exists && parentDir2.isDirectory)
val permission2 = Files.getPosixFilePermissions(parentDir2.toPath)
assert(permission2.contains(PosixFilePermission.GROUP_WRITE))
} finally {
getAndSetUmask(posix, oldUmask)
}
} else {
logInfo("Skipping test for SPARK-37618, native posix support not found")
}
val oldUmask = getAndSetUmask(posix, "077")
val diskBlockManager = new DiskBlockManager(conf, deleteFilesOnStop = true, isDriver = false)
val blockId = new TestBlockId("test")
val newFile = diskBlockManager.getFile(blockId)
val parentDir = newFile.getParentFile()
assert(parentDir.exists && parentDir.isDirectory)
val permission = Files.getPosixFilePermissions(parentDir.toPath)
assert(!permission.contains(PosixFilePermission.GROUP_WRITE))

assert(parentDir.delete())

conf.set("spark.shuffle.service.removeShuffle", "true")
val diskBlockManager2 = new DiskBlockManager(conf, deleteFilesOnStop = true, isDriver = false)
val newFile2 = diskBlockManager2.getFile(blockId)
val parentDir2 = newFile2.getParentFile()
assert(parentDir2.exists && parentDir2.isDirectory)
val permission2 = Files.getPosixFilePermissions(parentDir2.toPath)
assert(permission2.contains(PosixFilePermission.GROUP_WRITE))
getAndSetUmask(posix, oldUmask)
}

def writeToFile(file: File, numBytes: Int): Unit = {
Expand Down