Skip to content

Commit

Permalink
Revert "[MINOR] test: fix tempdir leak in KerberizedHdfs tests (#721)" (
Browse files Browse the repository at this point in the history
#732)

This reverts commit 37d7659.
  • Loading branch information
jerqi committed Mar 16, 2023
1 parent 4ffee9e commit 5f79003
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
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 @@ -73,7 +75,8 @@ public class KerberizedHdfs implements Serializable {

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

private MiniDFSCluster kerberizedDfsCluster;

Expand All @@ -88,12 +91,9 @@ 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.getAbsolutePath();
String keystoresDir = kerberizedDfsBaseDir.toFile().getAbsolutePath();
String sslConfDir = KeyStoreTestUtil.getClasspathDir(testRunnerCls);
KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, conf, false);

Expand Down Expand Up @@ -222,6 +222,7 @@ 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,10 +17,7 @@

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 @@ -33,13 +30,8 @@ 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(workDir, kerberizedDfsBaseDir);
kerberizedHdfs = new KerberizedHdfs();
kerberizedHdfs.setTestRunner(testRunner);
kerberizedHdfs.setup();
}
Expand Down

0 comments on commit 5f79003

Please sign in to comment.