Skip to content

Commit

Permalink
[MINOR] test: fix tempdir leak in KerberizedHdfs tests (apache#721)
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?

Use JUnit 5 managed `@TempDir` in `KerberizedHdfs` test.

### Why are the changes needed?

The tempdir created by `KerberizedHdfs` is leaking.
It may cause test failures in some condition.

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?

Before:

```console
$ mvn test -Dtest=HadoopFilesystemProviderTest
...
$ find . -name 'serverKS.jks'
./common/target/tmp/kerberizedDfsBaseDir1821275617120252168/serverKS.jks
```

After:

```console
$ mvn test -Dtest=HadoopFilesystemProviderTest
...
$ find . -name 'serverKS.jks'
```
  • Loading branch information
kaijchen authored and advancedxy committed Mar 21, 2023
1 parent 79db18f commit 0b67416
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import java.net.BindException;
import java.net.ServerSocket;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -75,8 +73,7 @@ public class KerberizedHdfs implements Serializable {

private MiniKdc kdc;
private File workDir;
private Path tempDir;
private Path kerberizedDfsBaseDir;
private File kerberizedDfsBaseDir;

private MiniDFSCluster kerberizedDfsCluster;

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

KerberizedHdfs(File workDir, File kerberizedDfsBaseDir) {
this.workDir = workDir;
this.kerberizedDfsBaseDir = kerberizedDfsBaseDir;
}

protected void setup() throws Exception {
tempDir = Files.createTempDirectory("tempDir").toFile().toPath();
kerberizedDfsBaseDir = Files.createTempDirectory("kerberizedDfsBaseDir").toFile().toPath();

startKDC();
try {
Expand Down Expand Up @@ -159,7 +159,7 @@ private Configuration createSecureDFSConfig() throws Exception {
CommonConfigurationKeysPublic.HADOOP_SECURITY_IMPERSONATION_PROVIDER_CLASS,
TestDummyImpersonationProvider.class.getName());

String keystoresDir = kerberizedDfsBaseDir.toFile().getAbsolutePath();
String keystoresDir = kerberizedDfsBaseDir.getAbsolutePath();
String sslConfDir = KeyStoreTestUtil.getClasspathDir(testRunnerCls);
KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, conf, false);

Expand Down Expand Up @@ -222,7 +222,6 @@ private void startKDC() throws Exception {
kdcConf.setProperty(MiniKdc.ORG_DOMAIN, "COM");
kdcConf.setProperty(MiniKdc.KDC_BIND_ADDRESS, hostName);
kdcConf.setProperty(MiniKdc.KDC_PORT, "0");
workDir = tempDir.toFile();
kdc = new MiniKdc(kdcConf, workDir);
kdc.start();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@

package org.apache.uniffle.common;

import java.io.File;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.io.TempDir;

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

@TempDir
private static File workDir;
@TempDir
private static File kerberizedDfsBaseDir;

public static void init() throws Exception {
kerberizedHdfs = new KerberizedHdfs();
kerberizedHdfs = new KerberizedHdfs(workDir, kerberizedDfsBaseDir);
kerberizedHdfs.setTestRunner(testRunner);
kerberizedHdfs.setup();
}
Expand Down

0 comments on commit 0b67416

Please sign in to comment.