Skip to content

Commit 5f79003

Browse files
committed
Revert "[MINOR] test: fix tempdir leak in KerberizedHdfs tests (#721)" (#732)
This reverts commit 37d7659.
1 parent 4ffee9e commit 5f79003

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

common/src/test/java/org/apache/uniffle/common/KerberizedHdfs.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import java.net.BindException;
2626
import java.net.ServerSocket;
2727
import java.nio.charset.StandardCharsets;
28+
import java.nio.file.Files;
29+
import java.nio.file.Path;
2830
import java.security.PrivilegedExceptionAction;
2931
import java.util.ArrayList;
3032
import java.util.List;
@@ -73,7 +75,8 @@ public class KerberizedHdfs implements Serializable {
7375

7476
private MiniKdc kdc;
7577
private File workDir;
76-
private File kerberizedDfsBaseDir;
78+
private Path tempDir;
79+
private Path kerberizedDfsBaseDir;
7780

7881
private MiniDFSCluster kerberizedDfsCluster;
7982

@@ -88,12 +91,9 @@ public class KerberizedHdfs implements Serializable {
8891
// krb5.conf file path
8992
private String krb5ConfFile;
9093

91-
KerberizedHdfs(File workDir, File kerberizedDfsBaseDir) {
92-
this.workDir = workDir;
93-
this.kerberizedDfsBaseDir = kerberizedDfsBaseDir;
94-
}
95-
9694
protected void setup() throws Exception {
95+
tempDir = Files.createTempDirectory("tempDir").toFile().toPath();
96+
kerberizedDfsBaseDir = Files.createTempDirectory("kerberizedDfsBaseDir").toFile().toPath();
9797

9898
startKDC();
9999
try {
@@ -159,7 +159,7 @@ private Configuration createSecureDFSConfig() throws Exception {
159159
CommonConfigurationKeysPublic.HADOOP_SECURITY_IMPERSONATION_PROVIDER_CLASS,
160160
TestDummyImpersonationProvider.class.getName());
161161

162-
String keystoresDir = kerberizedDfsBaseDir.getAbsolutePath();
162+
String keystoresDir = kerberizedDfsBaseDir.toFile().getAbsolutePath();
163163
String sslConfDir = KeyStoreTestUtil.getClasspathDir(testRunnerCls);
164164
KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, conf, false);
165165

@@ -222,6 +222,7 @@ private void startKDC() throws Exception {
222222
kdcConf.setProperty(MiniKdc.ORG_DOMAIN, "COM");
223223
kdcConf.setProperty(MiniKdc.KDC_BIND_ADDRESS, hostName);
224224
kdcConf.setProperty(MiniKdc.KDC_PORT, "0");
225+
workDir = tempDir.toFile();
225226
kdc = new MiniKdc(kdcConf, workDir);
226227
kdc.start();
227228

common/src/test/java/org/apache/uniffle/common/KerberizedHdfsBase.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717

1818
package org.apache.uniffle.common;
1919

20-
import java.io.File;
21-
2220
import org.junit.jupiter.api.AfterAll;
23-
import org.junit.jupiter.api.io.TempDir;
2421

2522
import org.apache.uniffle.common.security.HadoopSecurityContext;
2623
import org.apache.uniffle.common.security.NoOpSecurityContext;
@@ -33,13 +30,8 @@ public class KerberizedHdfsBase {
3330
protected static KerberizedHdfs kerberizedHdfs;
3431
protected static Class<?> testRunner = KerberizedHdfsBase.class;
3532

36-
@TempDir
37-
private static File workDir;
38-
@TempDir
39-
private static File kerberizedDfsBaseDir;
40-
4133
public static void init() throws Exception {
42-
kerberizedHdfs = new KerberizedHdfs(workDir, kerberizedDfsBaseDir);
34+
kerberizedHdfs = new KerberizedHdfs();
4335
kerberizedHdfs.setTestRunner(testRunner);
4436
kerberizedHdfs.setup();
4537
}

0 commit comments

Comments
 (0)