Skip to content

Add option to skip Unix native rm explicitly #52489

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add option to skip Unix native rm explicitly #52489

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
12 changes: 11 additions & 1 deletion common/utils-java/src/main/java/org/apache/spark/network/util/JavaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ public static void deleteRecursively(File file, FilenameFilter filter)
// On Unix systems, use operating system command to run faster
// If that does not work out, fallback to the Java IO way
// We exclude Apple Silicon test environment due to the limited resource issues.
if (isUnix && filter == null && !(isMac && isTesting())) {
if (shouldTryUnixNativeRm()) {
try {
deleteRecursivelyUsingUnixNative(file);
return;
Expand Down Expand Up @@ -691,6 +691,16 @@ public static boolean isTesting() {
return System.getenv("SPARK_TESTING") != null || System.getProperty("spark.testing") != null;
}

/**
* Indicates whether Unix native rm binaries should be tried.
*/
public static boolean shouldTryUnixNativeRm() {
Boolean shouldSkipUnixNativeRm = Boolean.parseBoolean(
System.getProperty("spark.skipUnixNativeRm", "false")
);
return isUnix && filter == null && !(shouldSkipUnixNativeRm) && !(isMac && isTesting());
}

/**
* The `os.name` system property.
*/
Expand Down