commit 5f790032d2226d0d329a5f8b011f3461659118c8
author roryqi <roryqi@apache.org> Thu Mar 16 23:01:50 2023 +0800
committer roryqi <roryqi@tencent.com> Thu Mar 16 23:02:46 2023 +0800
tree c3e538b03fabc02d867de972b3dba5f898bdd486
parent 4ffee9eb1efa17e2faa66b72472dcd1613886cc1

Revert "[MINOR] test: fix tempdir leak in KerberizedHdfs tests (#721)" (#732)

This reverts commit 37d765998a6d5de31a0db4d4c1537b28790f21b4.

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

diff --git a/common/src/test/java/org/apache/uniffle/common/KerberizedHdfs.java b/common/src/test/java/org/apache/uniffle/common/KerberizedHdfs.java
index 312ff9b..dc1f19a 100644
--- a/common/src/test/java/org/apache/uniffle/common/KerberizedHdfs.java
+++ b/common/src/test/java/org/apache/uniffle/common/KerberizedHdfs.java
@@ -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;
@@ -73,7 +75,8 @@
 
   private MiniKdc kdc;
   private File workDir;
-  private File kerberizedDfsBaseDir;
+  private Path tempDir;
+  private Path kerberizedDfsBaseDir;
 
   private MiniDFSCluster kerberizedDfsCluster;
 
@@ -88,12 +91,9 @@
   // 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 {
@@ -159,7 +159,7 @@
         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);
 
@@ -222,6 +222,7 @@
     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();
 

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

diff --git a/common/src/test/java/org/apache/uniffle/common/KerberizedHdfsBase.java b/common/src/test/java/org/apache/uniffle/common/KerberizedHdfsBase.java
index d0e30b2..aec3627 100644
--- a/common/src/test/java/org/apache/uniffle/common/KerberizedHdfsBase.java
+++ b/common/src/test/java/org/apache/uniffle/common/KerberizedHdfsBase.java
@@ -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;
@@ -33,13 +30,8 @@
   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();
   }