This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new a33d8a3e66 HDDS-10166. Replace GenericTestUtils temporary directories
with `@TempDir` (#7399)
a33d8a3e66 is described below
commit a33d8a3e6683ab5dbe5fe9b9c196c18b36ddafda
Author: Rishabh Patel <[email protected]>
AuthorDate: Wed Nov 13 00:16:12 2024 -0800
HDDS-10166. Replace GenericTestUtils temporary directories with `@TempDir`
(#7399)
---
.../org/apache/ozone/test/GenericTestUtils.java | 15 +++++++++++++
.../hadoop/hdds/scm/TestXceiverClientManager.java | 22 +++++++------------
.../hadoop/hdds/scm/TestXceiverClientMetrics.java | 9 ++++----
.../org/apache/hadoop/ozone/TestBlockTokens.java | 8 +++----
.../apache/hadoop/ozone/TestBlockTokensCLI.java | 7 +++---
.../apache/hadoop/ozone/TestDelegationToken.java | 5 ++---
.../apache/hadoop/ozone/TestOMSortDatanodes.java | 8 +++----
.../ozone/client/rpc/OzoneRpcClientTests.java | 10 ++++-----
.../apache/hadoop/ozone/client/rpc/TestBCSID.java | 6 ------
.../rpc/TestContainerReplicationEndToEnd.java | 7 +-----
.../client/rpc/TestContainerStateMachine.java | 6 ------
.../TestContainerStateMachineFailureOnRead.java | 5 -----
.../rpc/TestContainerStateMachineFlushDelay.java | 6 ------
.../client/rpc/TestDeleteWithInAdequateDN.java | 7 ------
.../client/rpc/TestOzoneAtRestEncryption.java | 6 ++----
.../ozone/client/rpc/TestSecureOzoneRpcClient.java | 7 +++---
.../transport/server/ratis/TestCSMMetrics.java | 11 +++++-----
.../container/metrics/TestContainerMetrics.java | 21 +++++-------------
.../ozoneimpl/TestSecureOzoneContainer.java | 7 +++---
.../container/server/TestContainerServer.java | 14 ++++++------
.../server/TestSecureContainerServer.java | 19 ++++++----------
.../ozone/freon/TestHadoopDirTreeGenerator.java | 16 ++++++--------
.../ozone/freon/TestHadoopNestedDirGenerator.java | 15 +++++--------
.../ozone/freon/TestOmBucketReadWriteFileOps.java | 15 +++++--------
.../ozone/freon/TestOmBucketReadWriteKeyOps.java | 14 ++++++------
.../hadoop/ozone/fsck/TestContainerMapper.java | 12 +++++------
.../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 9 +++-----
.../ozone/om/TestOmContainerLocationCache.java | 9 +++-----
.../ozone/om/service/TestRangerBGSyncService.java | 5 ++---
.../hadoop/ozone/shell/TestOzoneShellHA.java | 25 +++++-----------------
.../hadoop/ozone/shell/TestOzoneTenantShell.java | 15 ++++---------
.../TestGenerateOzoneRequiredConfigurations.java | 16 +-------------
32 files changed, 120 insertions(+), 237 deletions(-)
diff --git
a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
index 48abd5e986..8a77042476 100644
---
a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
+++
b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
@@ -93,7 +93,10 @@ public abstract class GenericTestUtils {
* Get the (created) base directory for tests.
*
* @return the absolute directory
+ *
+ * @deprecated use {@link org.junit.jupiter.api.io.TempDir} instead.
*/
+ @Deprecated
public static File getTestDir() {
String prop =
System.getProperty(SYSPROP_TEST_DATA_DIR, DEFAULT_TEST_DATA_DIR);
@@ -110,7 +113,10 @@ public abstract class GenericTestUtils {
* Get an uncreated directory for tests.
*
* @return the absolute directory for tests. Caller is expected to create it.
+ *
+ * @deprecated use {@link org.junit.jupiter.api.io.TempDir} instead.
*/
+ @Deprecated
public static File getTestDir(String subdir) {
return new File(getTestDir(), subdir).getAbsoluteFile();
}
@@ -120,7 +126,10 @@ public abstract class GenericTestUtils {
* name. This is likely to provide a unique path for tests run in parallel
*
* @return the absolute directory for tests. Caller is expected to create it.
+ *
+ * @deprecated use {@link org.junit.jupiter.api.io.TempDir} instead.
*/
+ @Deprecated
public static File getRandomizedTestDir() {
return new File(getRandomizedTempPath());
}
@@ -132,7 +141,10 @@ public abstract class GenericTestUtils {
*
* @param subpath sub path, with no leading "/" character
* @return a string to use in paths
+ *
+ * @deprecated use {@link org.junit.jupiter.api.io.TempDir} instead.
*/
+ @Deprecated
public static String getTempPath(String subpath) {
String prop = WINDOWS ? DEFAULT_TEST_DATA_PATH
: System.getProperty(SYSPROP_TEST_DATA_DIR, DEFAULT_TEST_DATA_PATH);
@@ -153,8 +165,11 @@ public abstract class GenericTestUtils {
* under the relative path {@link #DEFAULT_TEST_DATA_PATH}
*
* @return a string to use in paths
+ *
+ * @deprecated use {@link org.junit.jupiter.api.io.TempDir} instead.
*/
@SuppressWarnings("java:S2245") // no need for secure random
+ @Deprecated
public static String getRandomizedTempPath() {
return getTempPath(getCallerClass(GenericTestUtils.class).getSimpleName()
+ "-" + randomAlphanumeric(10));
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientManager.java
index 95a0b0e17f..83a9b106c8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientManager.java
@@ -29,16 +29,16 @@ import
org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolCli
import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.container.common.SCMTestUtils;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import java.io.IOException;
-import java.util.UUID;
+import java.nio.file.Path;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_METADATA_DIR_NAME;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY;
@@ -82,12 +82,10 @@ public class TestXceiverClientManager {
@ParameterizedTest(name = "Ozone security enabled: {0}")
@ValueSource(booleans = {false, true})
- public void testCaching(boolean securityEnabled) throws IOException {
+ public void testCaching(boolean securityEnabled, @TempDir Path metaDir)
throws IOException {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, securityEnabled);
- String metaDir = GenericTestUtils.getTempPath(
- TestXceiverClientManager.class.getName() + UUID.randomUUID());
- conf.set(HDDS_METADATA_DIR_NAME, metaDir);
+ conf.set(HDDS_METADATA_DIR_NAME, metaDir.toString());
ClientTrustManager trustManager = mock(ClientTrustManager.class);
try (XceiverClientManager clientManager = new XceiverClientManager(conf,
@@ -124,13 +122,11 @@ public class TestXceiverClientManager {
}
@Test
- public void testFreeByReference() throws IOException {
+ public void testFreeByReference(@TempDir Path metaDir) throws IOException {
OzoneConfiguration conf = new OzoneConfiguration();
ScmClientConfig clientConfig = conf.getObject(ScmClientConfig.class);
clientConfig.setMaxSize(1);
- String metaDir = GenericTestUtils.getTempPath(
- TestXceiverClientManager.class.getName() + UUID.randomUUID());
- conf.set(HDDS_METADATA_DIR_NAME, metaDir);
+ conf.set(HDDS_METADATA_DIR_NAME, metaDir.toString());
try (XceiverClientManager clientManager =
new XceiverClientManager(conf, clientConfig, null)) {
Cache<String, XceiverClientSpi> cache =
@@ -181,13 +177,11 @@ public class TestXceiverClientManager {
}
@Test
- public void testFreeByEviction() throws IOException {
+ public void testFreeByEviction(@TempDir Path metaDir) throws IOException {
OzoneConfiguration conf = new OzoneConfiguration();
ScmClientConfig clientConfig = conf.getObject(ScmClientConfig.class);
clientConfig.setMaxSize(1);
- String metaDir = GenericTestUtils.getTempPath(
- TestXceiverClientManager.class.getName() + UUID.randomUUID());
- conf.set(HDDS_METADATA_DIR_NAME, metaDir);
+ conf.set(HDDS_METADATA_DIR_NAME, metaDir.toString());
try (XceiverClientManager clientManager =
new XceiverClientManager(conf, clientConfig, null)) {
Cache<String, XceiverClientSpi> cache =
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientMetrics.java
index c4f6204053..92af6690cf 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientMetrics.java
@@ -22,9 +22,9 @@ import static
org.apache.ozone.test.MetricsAsserts.assertCounter;
import static org.apache.ozone.test.MetricsAsserts.getLongCounter;
import static org.apache.ozone.test.MetricsAsserts.getMetrics;
+import java.nio.file.Path;
import java.util.List;
import java.util.ArrayList;
-import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
@@ -45,6 +45,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
/**
* This class tests the metrics of XceiverClient.
@@ -76,11 +77,9 @@ public class TestXceiverClientMetrics {
}
@Test
- public void testMetrics() throws Exception {
+ public void testMetrics(@TempDir Path metaDir) throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
- String metaDir = GenericTestUtils.getTempPath(
- TestXceiverClientManager.class.getName() + UUID.randomUUID());
- conf.set(HDDS_METADATA_DIR_NAME, metaDir);
+ conf.set(HDDS_METADATA_DIR_NAME, metaDir.toString());
try (XceiverClientManager clientManager = new XceiverClientManager(conf)) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
index 26c1868084..625cf15ea5 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
@@ -46,12 +46,12 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.ratis.util.ExitUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -109,9 +109,10 @@ public final class TestBlockTokens {
private static final int EXPIRY_DURATION_IN_MS = 10000;
private static final int ROTATION_CHECK_DURATION_IN_MS = 100;
+ @TempDir
+ private static File workDir;
private static MiniKdc miniKdc;
private static OzoneConfiguration conf;
- private static File workDir;
private static File ozoneKeytab;
private static File spnegoKeytab;
private static File testUserKeytab;
@@ -129,9 +130,6 @@ public final class TestBlockTokens {
ExitUtils.disableSystemExit();
- workDir =
- GenericTestUtils.getTestDir(TestBlockTokens.class.getSimpleName());
-
startMiniKdc();
setSecureConfig();
createCredentialsInKDC();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
index 87242cb279..45897925c9 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ratis.util.ExitUtils;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,10 +87,12 @@ import org.junit.jupiter.api.Timeout;
public final class TestBlockTokensCLI {
private static final Logger LOG = LoggerFactory
.getLogger(TestBlockTokensCLI.class);
+
+ @TempDir
+ private static File workDir;
private static MiniKdc miniKdc;
private static OzoneAdmin ozoneAdmin;
private static OzoneConfiguration conf;
- private static File workDir;
private static File ozoneKeytab;
private static File spnegoKeytab;
private static String host;
@@ -105,8 +108,6 @@ public final class TestBlockTokensCLI {
ExitUtils.disableSystemExit();
- workDir =
- GenericTestUtils.getTestDir(TestBlockTokens.class.getSimpleName());
omServiceId = "om-service-test";
scmServiceId = "scm-service-test";
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDelegationToken.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDelegationToken.java
index 099c1d2e1f..e0c2a29239 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDelegationToken.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDelegationToken.java
@@ -119,10 +119,11 @@ public final class TestDelegationToken {
@TempDir
private Path folder;
+ @TempDir
+ private File workDir;
private MiniKdc miniKdc;
private OzoneConfiguration conf;
- private File workDir;
private File scmKeytab;
private File spnegoKeytab;
private File omKeyTab;
@@ -166,8 +167,6 @@ public final class TestDelegationToken {
conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
conf.set(HADOOP_SECURITY_AUTHENTICATION, KERBEROS.name());
- workDir = GenericTestUtils.getTestDir(getClass().getSimpleName());
-
startMiniKdc();
setSecureConfig();
createCredentialsInKDC();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java
index 2964912c40..6b7dde3934 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone;
import com.google.common.collect.ImmutableMap;
-import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.DFSConfigKeysLegacy;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -36,11 +35,11 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.om.KeyManagerImpl;
import org.apache.hadoop.ozone.om.OmTestManagers;
import org.apache.hadoop.ozone.om.OzoneManager;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
import java.io.File;
import java.util.List;
@@ -62,13 +61,14 @@ import static org.mockito.Mockito.mock;
@Timeout(300)
public class TestOMSortDatanodes {
+ @TempDir
+ private static File dir;
private static OzoneConfiguration config;
private static StorageContainerManager scm;
private static NodeManager nodeManager;
private static KeyManagerImpl keyManager;
private static StorageContainerLocationProtocol mockScmContainerClient;
private static OzoneManager om;
- private static File dir;
private static final int NODE_COUNT = 10;
private static final Map<String, String> EDGE_NODES = ImmutableMap.of(
"edge0", "/rack0",
@@ -80,7 +80,6 @@ public class TestOMSortDatanodes {
@BeforeAll
public static void setup() throws Exception {
config = new OzoneConfiguration();
- dir = GenericTestUtils.getRandomizedTestDir();
config.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.toString());
config.set(NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY,
StaticMapping.class.getName());
@@ -128,7 +127,6 @@ public class TestOMSortDatanodes {
if (om != null) {
om.stop();
}
- FileUtils.deleteDirectory(dir);
}
@Test
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
index 5d006e47e7..9ed0b182d3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
+import java.nio.file.Path;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.PrivilegedExceptionAction;
@@ -194,6 +195,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.EnumSource;
@@ -4809,17 +4811,13 @@ abstract class OzoneRpcClientTests extends
OzoneTestBase {
}
@Test
- public void testUploadWithStreamAndMemoryMappedBuffer() throws IOException {
- // create a local dir
- final String dir = GenericTestUtils.getTempPath(
- getClass().getSimpleName());
- GenericTestUtils.assertDirCreation(new File(dir));
+ public void testUploadWithStreamAndMemoryMappedBuffer(@TempDir Path dir)
throws IOException {
// create a local file
final int chunkSize = 1024;
final byte[] data = new byte[8 * chunkSize];
ThreadLocalRandom.current().nextBytes(data);
- final File file = new File(dir, "data");
+ final File file = new File(dir.toString(), "data");
try (FileOutputStream out = new FileOutputStream(file)) {
out.write(data);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java
index d668bb4b65..c66ca2931b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java
@@ -32,13 +32,11 @@ import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
@@ -75,10 +73,6 @@ public class TestBCSID {
*/
@BeforeAll
public static void init() throws Exception {
- String path = GenericTestUtils
- .getTempPath(TestBCSID.class.getSimpleName());
- File baseDir = new File(path);
- baseDir.mkdirs();
conf.setTimeDuration(HDDS_CONTAINER_REPORT_INTERVAL, 200,
TimeUnit.MILLISECONDS);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
index 78a4e78647..8d89447128 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
@@ -49,7 +49,6 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
-import java.io.File;
import java.io.IOException;
import java.time.Duration;
import java.util.HashMap;
@@ -80,7 +79,6 @@ public class TestContainerReplicationEndToEnd {
private static ObjectStore objectStore;
private static String volumeName;
private static String bucketName;
- private static String path;
private static XceiverClientManager xceiverClientManager;
private static long containerReportInterval;
@@ -92,10 +90,7 @@ public class TestContainerReplicationEndToEnd {
@BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
- path = GenericTestUtils
- .getTempPath(TestContainerStateMachineFailures.class.getSimpleName());
- File baseDir = new File(path);
- baseDir.mkdirs();
+
containerReportInterval = 2000;
conf.setTimeDuration(HDDS_CONTAINER_REPORT_INTERVAL,
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachine.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachine.java
index 3f1c31edfe..dc00b0acc5 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachine.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachine.java
@@ -47,7 +47,6 @@ import
org.apache.hadoop.ozone.container.common.transport.server.ratis.Container
import
org.apache.hadoop.ozone.container.common.transport.server.ratis.RatisServerConfiguration;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
-import org.apache.ozone.test.GenericTestUtils;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED;
@@ -78,7 +77,6 @@ public class TestContainerStateMachine {
private ObjectStore objectStore;
private String volumeName;
private String bucketName;
- private String path;
/**
* Create a MiniDFSCluster for testing.
@@ -87,10 +85,6 @@ public class TestContainerStateMachine {
*/
@BeforeEach
public void setup() throws Exception {
- path = GenericTestUtils
- .getTempPath(TestContainerStateMachine.class.getSimpleName());
- File baseDir = new File(path);
- baseDir.mkdirs();
conf.setInt(ScmConfigKeys.OZONE_DATANODE_PIPELINE_LIMIT, 1);
conf.setTimeDuration(HDDS_HEARTBEAT_INTERVAL, 200, TimeUnit.MILLISECONDS);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailureOnRead.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailureOnRead.java
index eea068a874..f351ad8927 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailureOnRead.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailureOnRead.java
@@ -46,7 +46,6 @@ import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
-import org.apache.ozone.test.GenericTestUtils;
import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_COMMAND_STATUS_REPORT_INTERVAL;
@@ -80,10 +79,6 @@ public class TestContainerStateMachineFailureOnRead {
@BeforeEach
public void setup() throws Exception {
conf = new OzoneConfiguration();
- String path = GenericTestUtils
- .getTempPath(TestContainerStateMachineFailures.class.getSimpleName());
- File baseDir = new File(path);
- baseDir.mkdirs();
conf.setTimeDuration(HDDS_CONTAINER_REPORT_INTERVAL, 200,
TimeUnit.MILLISECONDS);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFlushDelay.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFlushDelay.java
index 229059d84a..b59d4885d7 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFlushDelay.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFlushDelay.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -72,7 +71,6 @@ public class TestContainerStateMachineFlushDelay {
private ObjectStore objectStore;
private String volumeName;
private String bucketName;
- private String path;
private int chunkSize;
private int flushSize;
private int maxFlushSize;
@@ -91,10 +89,6 @@ public class TestContainerStateMachineFlushDelay {
maxFlushSize = 2 * flushSize;
blockSize = 2 * maxFlushSize;
keyString = UUID.randomUUID().toString();
- path = GenericTestUtils
-
.getTempPath(TestContainerStateMachineFlushDelay.class.getSimpleName());
- File baseDir = new File(path);
- baseDir.mkdirs();
conf.setBoolean(HDDS_BLOCK_TOKEN_ENABLED, true);
// conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java
index d4ff857362..bb42d8a0f5 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java
@@ -17,7 +17,6 @@
package org.apache.hadoop.ozone.client.rpc;
-import java.io.File;
import java.io.IOException;
import java.time.Duration;
import java.util.HashMap;
@@ -60,7 +59,6 @@ import
org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
-import org.apache.ozone.test.GenericTestUtils;
import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_COMMAND_STATUS_REPORT_INTERVAL;
@@ -91,7 +89,6 @@ public class TestDeleteWithInAdequateDN {
private static ObjectStore objectStore;
private static String volumeName;
private static String bucketName;
- private static String path;
private static XceiverClientManager xceiverClientManager;
private static final int FACTOR_THREE_PIPELINE_COUNT = 1;
@@ -105,10 +102,6 @@ public class TestDeleteWithInAdequateDN {
final int numOfDatanodes = 3;
conf = new OzoneConfiguration();
- path = GenericTestUtils
- .getTempPath(TestContainerStateMachineFailures.class.getSimpleName());
- File baseDir = new File(path);
- baseDir.mkdirs();
conf.setTimeDuration(HDDS_HEARTBEAT_INTERVAL, 100,
TimeUnit.MILLISECONDS);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
index b3d38fe8bc..5252f49daa 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
@@ -112,6 +112,7 @@ import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
@@ -124,7 +125,7 @@ class TestOzoneAtRestEncryption {
private static OzoneManager ozoneManager;
private static StorageContainerLocationProtocolClientSideTranslatorPB
storageContainerLocationClient;
-
+ @TempDir
private static File testDir;
private static OzoneConfiguration conf;
private static final String TEST_KEY = "key1";
@@ -140,9 +141,6 @@ class TestOzoneAtRestEncryption {
@BeforeAll
static void init() throws Exception {
- testDir = GenericTestUtils.getTestDir(
- TestSecureOzoneRpcClient.class.getSimpleName());
-
File kmsDir = new File(testDir, UUID.randomUUID().toString());
assertTrue(kmsDir.mkdirs());
MiniKMS.Builder miniKMSBuilder = new MiniKMS.Builder();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
index b2766599ae..fc29e03154 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
@@ -68,6 +68,7 @@ import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -99,15 +100,15 @@ import static
org.junit.jupiter.api.Assertions.assertThrows;
*/
class TestSecureOzoneRpcClient extends OzoneRpcClientTests {
+ @TempDir
+ private static File testDir;
private static String keyProviderUri = "kms://http@kms:9600/kms";
@BeforeAll
public static void init() throws Exception {
- File testDir = GenericTestUtils.getTestDir(
- TestSecureOzoneRpcClient.class.getSimpleName());
OzoneManager.setTestSecureOmFlag(true);
OzoneConfiguration conf = new OzoneConfiguration();
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
+ conf.set(OZONE_METADATA_DIRS, testDir.getAbsolutePath());
conf.setInt(ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT, 1);
conf.setBoolean(HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED, true);
conf.set(OZONE_METADATA_DIRS, testDir.getAbsolutePath());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
index e68831b494..3c41c0f19e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
@@ -22,8 +22,8 @@ import static
org.apache.ozone.test.MetricsAsserts.assertCounter;
import static org.apache.ozone.test.MetricsAsserts.getDoubleGauge;
import static org.apache.ozone.test.MetricsAsserts.getMetrics;
-import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.List;
import java.util.ArrayList;
@@ -49,7 +49,6 @@ import
org.apache.hadoop.ozone.container.common.interfaces.Handler;
import org.apache.hadoop.ozone.container.common.transport.server
.XceiverServerSpi;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import static org.apache.ratis.rpc.SupportedRpcType.GRPC;
@@ -66,14 +65,14 @@ import java.util.function.BiConsumer;
import org.apache.ratis.util.function.CheckedBiFunction;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
/**
* This class tests the metrics of ContainerStateMachine.
*/
public class TestCSMMetrics {
- private static final String TEST_DIR =
- GenericTestUtils.getTestDir("dfs").getAbsolutePath()
- + File.separator;
+ @TempDir
+ private static Path testDir;
@BeforeAll
public static void setup() {
@@ -185,7 +184,7 @@ public class TestCSMMetrics {
DatanodeDetails dn, OzoneConfiguration conf) throws IOException {
conf.setInt(OzoneConfigKeys.HDDS_CONTAINER_RATIS_IPC_PORT,
dn.getPort(DatanodeDetails.Port.Name.RATIS).getValue());
- final String dir = TEST_DIR + dn.getUuid();
+ final String dir = testDir.resolve(dn.getUuidString()).toString();
conf.set(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATANODE_STORAGE_DIR, dir);
final ContainerDispatcher dispatcher = new TestContainerDispatcher();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
index e6264cd3e1..dd082b4e07 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.commons.io.FileUtils;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdds.DFSConfigKeysLegacy;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -59,7 +58,6 @@ import
org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet;
import org.apache.hadoop.ozone.container.common.volume.StorageVolume;
import org.apache.hadoop.ozone.container.common.volume.VolumeSet;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;
-import org.apache.ozone.test.GenericTestUtils;
import com.google.common.collect.Maps;
import static org.apache.ozone.test.MetricsAsserts.assertCounter;
@@ -72,7 +70,6 @@ import org.apache.ratis.util.function.CheckedBiConsumer;
import org.apache.ratis.util.function.CheckedBiFunction;
import org.apache.ratis.util.function.CheckedConsumer;
import org.apache.ratis.util.function.CheckedFunction;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -84,7 +81,8 @@ import org.junit.jupiter.api.io.TempDir;
*/
@Timeout(300)
public class TestContainerMetrics {
- static final String TEST_DIR = GenericTestUtils.getRandomizedTempPath() +
File.separator;
+ @TempDir
+ private static Path testDir;
@TempDir
private Path tempDir;
private static final OzoneConfiguration CONF = new OzoneConfiguration();
@@ -96,17 +94,8 @@ public class TestContainerMetrics {
CONF.setInt(DFSConfigKeysLegacy.DFS_METRICS_PERCENTILES_INTERVALS_KEY,
DFS_METRICS_PERCENTILES_INTERVALS);
CONF.setBoolean(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_ENABLED,
false);
- CONF.set(OzoneConfigKeys.OZONE_METADATA_DIRS, TEST_DIR);
-
- }
+ CONF.set(OzoneConfigKeys.OZONE_METADATA_DIRS, testDir.toString());
- @AfterAll
- public static void cleanup() {
- // clean up volume dir
- File file = new File(TEST_DIR);
- if (file.exists()) {
- FileUtil.fullyDelete(file);
- }
}
@AfterEach
@@ -185,7 +174,7 @@ public class TestContainerMetrics {
initConf.accept(pipeline);
DatanodeDetails dn = pipeline.getFirstNode();
- volumeSet = createVolumeSet(dn, TEST_DIR + dn.getUuidString());
+ volumeSet = createVolumeSet(dn,
testDir.resolve(dn.getUuidString()).toString());
server = createServer.apply(dn, volumeSet);
server.start();
initServer.accept(dn, pipeline);
@@ -249,7 +238,7 @@ public class TestContainerMetrics {
throws IOException {
CONF.setInt(OzoneConfigKeys.HDDS_CONTAINER_RATIS_IPC_PORT,
dn.getPort(DatanodeDetails.Port.Name.RATIS).getValue());
- final String dir = TEST_DIR + dn.getUuid();
+ final String dir = testDir.resolve(dn.getUuidString()).toString();
CONF.set(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATANODE_STORAGE_DIR, dir);
final ContainerDispatcher dispatcher = createDispatcher(dn,
volumeSet);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
index 92d716f7a4..d5231911eb 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
@@ -42,7 +42,6 @@ import
org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.ratis.util.ExitUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -82,6 +81,8 @@ class TestSecureOzoneContainer {
@TempDir
private Path tempFolder;
+ @TempDir
+ private Path ozoneMetaPath;
private OzoneConfiguration conf;
private CertificateClientTestImpl caClient;
@@ -107,9 +108,7 @@ class TestSecureOzoneContainer {
@BeforeEach
void setup() throws Exception {
conf = new OzoneConfiguration();
- String ozoneMetaPath =
- GenericTestUtils.getTempPath("ozoneMeta");
- conf.set(OZONE_METADATA_DIRS, ozoneMetaPath);
+ conf.set(OZONE_METADATA_DIRS, ozoneMetaPath.toString());
caClient = new CertificateClientTestImpl(conf);
secretKeyClient = new SecretKeyTestClient();
secretManager = new ContainerTokenSecretManager(
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
index 8db7b13747..b657d103a9 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.container.server;
-import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -63,7 +62,6 @@ import
org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet;
import org.apache.hadoop.ozone.container.common.volume.StorageVolume;
import org.apache.hadoop.ozone.container.common.volume.VolumeSet;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;
-import org.apache.ozone.test.GenericTestUtils;
import com.google.common.collect.Maps;
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.util.function.CheckedBiConsumer;
@@ -83,8 +81,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test Containers.
*/
public class TestContainerServer {
- static final String TEST_DIR = GenericTestUtils.getTestDir("dfs")
- .getAbsolutePath() + File.separator;
+ @TempDir
+ private static Path testDir;
private static final OzoneConfiguration CONF = new OzoneConfiguration();
private static CertificateClient caClient;
@TempDir
@@ -93,7 +91,7 @@ public class TestContainerServer {
@BeforeAll
public static void setup() {
DefaultMetricsSystem.setMiniClusterMode(true);
- CONF.set(HddsConfigKeys.HDDS_METADATA_DIR_NAME, TEST_DIR);
+ CONF.set(HddsConfigKeys.HDDS_METADATA_DIR_NAME, testDir.toString());
CONF.setBoolean(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_ENABLED,
false);
DatanodeDetails dn = MockDatanodeDetails.randomDatanodeDetails();
caClient = new DNCertificateClient(new SecurityConfig(CONF), null,
@@ -128,7 +126,7 @@ public class TestContainerServer {
DatanodeDetails dn, OzoneConfiguration conf) throws IOException {
conf.setInt(OzoneConfigKeys.HDDS_CONTAINER_RATIS_IPC_PORT,
dn.getPort(DatanodeDetails.Port.Name.RATIS).getValue());
- final String dir = TEST_DIR + dn.getUuid();
+ final String dir = testDir.resolve(dn.getUuid().toString()).toString();
conf.set(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATANODE_STORAGE_DIR, dir);
final ContainerDispatcher dispatcher = new TestContainerDispatcher();
@@ -192,9 +190,9 @@ public class TestContainerServer {
throws IOException {
ContainerSet containerSet = new ContainerSet(1000);
conf.set(HDDS_DATANODE_DIR_KEY,
- Paths.get(TEST_DIR, "dfs", "data", "hdds",
+ Paths.get(testDir.toString(), "dfs", "data", "hdds",
RandomStringUtils.randomAlphabetic(4)).toString());
- conf.set(OZONE_METADATA_DIRS, TEST_DIR);
+ conf.set(OZONE_METADATA_DIRS, testDir.toString());
VolumeSet volumeSet = new MutableVolumeSet(dd.getUuidString(), conf, null,
StorageVolume.VolumeType.DATA_VOLUME, null);
StorageVolumeUtil.getHddsVolumesList(volumeSet.getVolumesList())
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
index 0bdf61b3bd..8359a26946 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
@@ -73,7 +73,6 @@ import
org.apache.hadoop.ozone.container.common.volume.VolumeSet;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenSecretManager;
import org.apache.hadoop.security.token.Token;
-import org.apache.ozone.test.GenericTestUtils;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED;
import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
@@ -101,7 +100,6 @@ import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.function.CheckedBiConsumer;
import org.apache.ratis.util.function.CheckedBiFunction;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -120,8 +118,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class TestSecureContainerServer {
@TempDir
private Path tempDir;
- private static final String TEST_DIR
- = GenericTestUtils.getTestDir("dfs").getAbsolutePath() + File.separator;
+ @TempDir
+ private static Path testDir;
private static final OzoneConfiguration CONF = new OzoneConfiguration();
private static CertificateClientTestImpl caClient;
private static SecretKeyClient secretKeyClient;
@@ -132,7 +130,7 @@ public class TestSecureContainerServer {
public static void setup() throws Exception {
DefaultMetricsSystem.setMiniClusterMode(true);
ExitUtils.disableSystemExit();
- CONF.set(HddsConfigKeys.HDDS_METADATA_DIR_NAME, TEST_DIR);
+ CONF.set(HddsConfigKeys.HDDS_METADATA_DIR_NAME, testDir.toString());
CONF.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
CONF.setBoolean(HDDS_BLOCK_TOKEN_ENABLED, true);
caClient = new CertificateClientTestImpl(CONF);
@@ -147,11 +145,6 @@ public class TestSecureContainerServer {
tokenLifetime, secretKeyClient);
}
- @AfterAll
- public static void deleteTestDir() {
- FileUtils.deleteQuietly(new File(TEST_DIR));
- }
-
@AfterEach
public void cleanUp() throws IOException {
FileUtils.deleteQuietly(new File(CONF.get(HDDS_DATANODE_DIR_KEY)));
@@ -175,9 +168,9 @@ public class TestSecureContainerServer {
OzoneConfiguration conf) throws IOException {
ContainerSet containerSet = new ContainerSet(1000);
conf.set(HDDS_DATANODE_DIR_KEY,
- Paths.get(TEST_DIR, "dfs", "data", "hdds",
+ Paths.get(testDir.toString(), "dfs", "data", "hdds",
RandomStringUtils.randomAlphabetic(4)).toString());
- conf.set(OZONE_METADATA_DIRS, TEST_DIR);
+ conf.set(OZONE_METADATA_DIRS, testDir.toString());
VolumeSet volumeSet = new MutableVolumeSet(dd.getUuidString(), conf, null,
StorageVolume.VolumeType.DATA_VOLUME, null);
StorageVolumeUtil.getHddsVolumesList(volumeSet.getVolumesList())
@@ -214,7 +207,7 @@ public class TestSecureContainerServer {
true);
conf.setBoolean(
OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_RANDOM_PORT, true);
- final String dir = TEST_DIR + dn.getUuid();
+ final String dir = testDir.resolve(dn.getUuidString()).toString();
conf.set(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATANODE_STORAGE_DIR, dir);
final ContainerDispatcher dispatcher = createDispatcher(dn,
UUID.randomUUID(), conf);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGenerator.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGenerator.java
index 9137eca6c0..e00a7c966d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGenerator.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGenerator.java
@@ -36,6 +36,7 @@ import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.raftlog.RaftLog;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
@@ -53,8 +54,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Test for HadoopDirTreeGenerator.
*/
public class TestHadoopDirTreeGenerator {
-
- private String path;
+ @TempDir
+ private java.nio.file.Path path;
private OzoneConfiguration conf = null;
private MiniOzoneCluster cluster = null;
private ObjectStore store = null;
@@ -64,12 +65,8 @@ public class TestHadoopDirTreeGenerator {
@BeforeEach
public void setup() {
- path = GenericTestUtils
- .getTempPath(TestHadoopDirTreeGenerator.class.getSimpleName());
GenericTestUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
GenericTestUtils.setLogLevel(RaftServer.LOG, Level.DEBUG);
- File baseDir = new File(path);
- baseDir.mkdirs();
}
/**
@@ -79,7 +76,6 @@ public class TestHadoopDirTreeGenerator {
IOUtils.closeQuietly(client);
if (cluster != null) {
cluster.shutdown();
- FileUtils.deleteDirectory(new File(path));
}
}
@@ -108,8 +104,8 @@ public class TestHadoopDirTreeGenerator {
public void testNestedDirTreeGeneration() throws Exception {
try {
startCluster();
- FileOutputStream out = FileUtils.openOutputStream(new File(path,
- "conf"));
+ FileOutputStream out = FileUtils.openOutputStream(new
File(path.toString(),
+ "conf"));
cluster.getConf().writeXml(out);
out.getFD().sync();
out.close();
@@ -140,7 +136,7 @@ public class TestHadoopDirTreeGenerator {
OzoneVolume volume = store.getVolume(volumeName);
volume.createBucket(bucketName);
String rootPath = "o3fs://" + bucketName + "." + volumeName;
- String confPath = new File(path, "conf").getAbsolutePath();
+ String confPath = new File(path.toString(), "conf").getAbsolutePath();
new Freon().execute(
new String[]{"-conf", confPath, "dtsg", "-d", depth + "", "-c",
fileCount + "", "-s", span + "", "-n", "1", "-r", rootPath,
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java
index 4411c0d2ea..f4993d538e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java
@@ -34,6 +34,7 @@ import org.apache.ratis.server.raftlog.RaftLog;
import java.util.LinkedList;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
@@ -42,7 +43,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URI;
-import static org.apache.ozone.test.GenericTestUtils.getTempPath;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
@@ -50,8 +50,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class TestHadoopNestedDirGenerator {
-
- private String path;
+ @TempDir
+ private java.nio.file.Path path;
private OzoneConfiguration conf = null;
private MiniOzoneCluster cluster = null;
private ObjectStore store = null;
@@ -61,11 +61,8 @@ public class TestHadoopNestedDirGenerator {
@BeforeEach
public void setup() {
- path = getTempPath(TestHadoopNestedDirGenerator.class.getSimpleName());
GenericTestUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
GenericTestUtils.setLogLevel(RaftServer.LOG, Level.DEBUG);
- File baseDir = new File(path);
- baseDir.mkdirs();
}
/**
@@ -76,7 +73,6 @@ public class TestHadoopNestedDirGenerator {
IOUtils.closeQuietly(client);
if (cluster != null) {
cluster.shutdown();
- FileUtils.deleteDirectory(new File(path));
}
}
@@ -101,8 +97,7 @@ public class TestHadoopNestedDirGenerator {
public void testNestedDirTreeGeneration() throws Exception {
try {
startCluster();
- FileOutputStream out = FileUtils.openOutputStream(new File(path,
- "conf"));
+ FileOutputStream out = FileUtils.openOutputStream(new
File(path.toString(), "conf"));
cluster.getConf().writeXml(out);
out.getFD().sync();
out.close();
@@ -128,7 +123,7 @@ public class TestHadoopNestedDirGenerator {
OzoneVolume volume = store.getVolume(volumeName);
volume.createBucket(bucketName);
String rootPath = "o3fs://" + bucketName + "." + volumeName;
- String confPath = new File(path, "conf").getAbsolutePath();
+ String confPath = new File(path.toString(), "conf").getAbsolutePath();
new Freon().execute(new String[]{"-conf", confPath, "ddsg", "-d",
actualDepth + "", "-s", span + "", "-n", "1", "-r", rootPath});
// verify the directory structure
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteFileOps.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteFileOps.java
index 5244bb8579..8eb83b9135 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteFileOps.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteFileOps.java
@@ -36,6 +36,7 @@ import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.raftlog.RaftLog;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
@@ -52,8 +53,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Test for OmBucketReadWriteFileOps.
*/
public class TestOmBucketReadWriteFileOps {
-
- private String path;
+ @TempDir
+ private java.nio.file.Path path;
private OzoneConfiguration conf = null;
private MiniOzoneCluster cluster = null;
private ObjectStore store = null;
@@ -63,12 +64,8 @@ public class TestOmBucketReadWriteFileOps {
@BeforeEach
public void setup() {
- path = GenericTestUtils
- .getTempPath(TestOmBucketReadWriteFileOps.class.getSimpleName());
GenericTestUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
GenericTestUtils.setLogLevel(RaftServer.LOG, Level.DEBUG);
- File baseDir = new File(path);
- baseDir.mkdirs();
}
/**
@@ -78,7 +75,6 @@ public class TestOmBucketReadWriteFileOps {
IOUtils.closeQuietly(client);
if (cluster != null) {
cluster.shutdown();
- FileUtils.deleteDirectory(new File(path));
}
}
@@ -107,8 +103,7 @@ public class TestOmBucketReadWriteFileOps {
public void testOmBucketReadWriteFileOps() throws Exception {
try {
startCluster();
- FileOutputStream out = FileUtils.openOutputStream(new File(path,
- "conf"));
+ FileOutputStream out = FileUtils.openOutputStream(new
File(path.toString(), "conf"));
cluster.getConf().writeXml(out);
out.getFD().sync();
out.close();
@@ -154,7 +149,7 @@ public class TestOmBucketReadWriteFileOps {
volume.createBucket(parameterBuilder.bucketName);
String rootPath = "o3fs://" + parameterBuilder.bucketName + "." +
parameterBuilder.volumeName + parameterBuilder.prefixFilePath;
- String confPath = new File(path, "conf").getAbsolutePath();
+ String confPath = new File(path.toString(), "conf").getAbsolutePath();
new Freon().execute(
new String[]{"-conf", confPath, "obrwf", "-P", rootPath,
"-r", String.valueOf(parameterBuilder.fileCountForRead),
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteKeyOps.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteKeyOps.java
index 3c7a04071b..5e24cfc4e0 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteKeyOps.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteKeyOps.java
@@ -34,6 +34,7 @@ import org.apache.ozone.test.GenericTestUtils;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.raftlog.RaftLog;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.Logger;
@@ -43,6 +44,7 @@ import org.slf4j.event.Level;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.Iterator;
import static org.assertj.core.api.Assertions.assertThat;
@@ -55,8 +57,8 @@ public class TestOmBucketReadWriteKeyOps {
// TODO: Remove code duplication of TestOmBucketReadWriteKeyOps with
// TestOmBucketReadWriteFileOps.
-
- private String path;
+ @TempDir
+ private Path path;
private OzoneConfiguration conf = null;
private MiniOzoneCluster cluster = null;
private ObjectStore store = null;
@@ -66,12 +68,8 @@ public class TestOmBucketReadWriteKeyOps {
@BeforeEach
public void setup() {
- path = GenericTestUtils
- .getTempPath(TestHadoopDirTreeGenerator.class.getSimpleName());
GenericTestUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
GenericTestUtils.setLogLevel(RaftServer.LOG, Level.DEBUG);
- File baseDir = new File(path);
- baseDir.mkdirs();
}
/**
@@ -111,7 +109,7 @@ public class TestOmBucketReadWriteKeyOps {
public void testOmBucketReadWriteKeyOps(boolean fsPathsEnabled) throws
Exception {
try {
startCluster(fsPathsEnabled);
- FileOutputStream out = FileUtils.openOutputStream(new File(path,
+ FileOutputStream out = FileUtils.openOutputStream(new
File(path.toString(),
"conf"));
cluster.getConf().writeXml(out);
out.getFD().sync();
@@ -157,7 +155,7 @@ public class TestOmBucketReadWriteKeyOps {
OzoneVolume volume = store.getVolume(parameterBuilder.volumeName);
volume.createBucket(parameterBuilder.bucketName);
OzoneBucket bucket = volume.getBucket(parameterBuilder.bucketName);
- String confPath = new File(path, "conf").getAbsolutePath();
+ String confPath = new File(path.toString(), "conf").getAbsolutePath();
long startTime = System.currentTimeMillis();
new Freon().execute(
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java
index 7811470887..63d2870e7d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java
@@ -35,15 +35,14 @@ import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ratis.util.FileUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
-import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -61,6 +60,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
@Timeout(value = 300, unit = TimeUnit.SECONDS)
public class TestContainerMapper {
+ @TempDir
+ private static Path dbPath;
private static MiniOzoneCluster cluster = null;
private static OzoneClient ozClient = null;
private static ObjectStore store = null;
@@ -71,14 +72,12 @@ public class TestContainerMapper {
private static String bucketName = UUID.randomUUID().toString();
private static OzoneConfiguration conf;
private static List<String> keyList = new ArrayList<>();
- private static String dbPath;
@BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
- dbPath = GenericTestUtils.getRandomizedTempPath();
- conf.set(OZONE_OM_DB_DIRS, dbPath);
+ conf.set(OZONE_OM_DB_DIRS, dbPath.toString());
conf.set(ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE, "100MB");
conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN,
0, StorageUnit.MB);
@@ -137,6 +136,5 @@ public class TestContainerMapper {
public static void shutdown() throws IOException {
IOUtils.closeQuietly(ozClient);
cluster.shutdown();
- FileUtils.deleteFully(new File(dbPath));
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
index e7df69a01d..a349acf6e3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
@@ -93,11 +93,9 @@ import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
import org.apache.hadoop.ozone.security.acl.RequestContext;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.hadoop.util.Time;
import com.google.common.collect.Sets;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomStringUtils;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
@@ -123,6 +121,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -155,7 +154,8 @@ import static org.mockito.Mockito.when;
*/
@Timeout(300)
public class TestKeyManagerImpl {
-
+ @TempDir
+ private static File dir;
private static PrefixManager prefixManager;
private static KeyManagerImpl keyManager;
private static NodeManager nodeManager;
@@ -164,7 +164,6 @@ public class TestKeyManagerImpl {
private static StorageContainerLocationProtocol mockScmContainerClient;
private static OzoneConfiguration conf;
private static OMMetadataManager metadataManager;
- private static File dir;
private static long scmBlockSize;
private static final String KEY_NAME = "key1";
private static final String BUCKET_NAME = "bucket1";
@@ -179,7 +178,6 @@ public class TestKeyManagerImpl {
public static void setUp() throws Exception {
ExitUtils.disableSystemExit();
conf = new OzoneConfiguration();
- dir = GenericTestUtils.getRandomizedTestDir();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.toString());
conf.set(OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY, "true");
final String rootPath = String.format("%s://%s/", OZONE_OFS_URI_SCHEME,
@@ -243,7 +241,6 @@ public class TestKeyManagerImpl {
scm.stop();
scm.join();
om.stop();
- FileUtils.deleteDirectory(dir);
}
@BeforeEach
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmContainerLocationCache.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmContainerLocationCache.java
index 5c7a0c3128..b48a7067ca 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmContainerLocationCache.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmContainerLocationCache.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.ozone.om;
import com.google.common.collect.ImmutableMap;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.ContainerBlockID;
@@ -72,7 +71,6 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.helpers.ServiceInfoEx;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.grpc.Status;
import org.apache.ratis.thirdparty.io.grpc.StatusException;
@@ -84,6 +82,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -137,12 +136,12 @@ import static org.mockito.Mockito.when;
*/
@Timeout(300)
public class TestOmContainerLocationCache {
-
+ @TempDir
+ private static File dir;
private static ScmBlockLocationProtocol mockScmBlockLocationProtocol;
private static StorageContainerLocationProtocol mockScmContainerClient;
private static OzoneConfiguration conf;
private static OMMetadataManager metadataManager;
- private static File dir;
private static final String BUCKET_NAME = "bucket1";
private static final String VERSIONED_BUCKET_NAME = "versionedBucket1";
private static final String VOLUME_NAME = "vol1";
@@ -170,7 +169,6 @@ public class TestOmContainerLocationCache {
ExitUtils.disableSystemExit();
conf = new OzoneConfiguration();
- dir = GenericTestUtils.getRandomizedTestDir();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.toString());
conf.set(OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY, "true");
conf.setLong(OZONE_KEY_PREALLOCATION_BLOCKS_MAX, 10);
@@ -208,7 +206,6 @@ public class TestOmContainerLocationCache {
public static void cleanup() throws Exception {
ozoneClient.close();
om.stop();
- FileUtils.deleteDirectory(dir);
}
private static XceiverClientManager mockDataNodeClientFactory()
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRangerBGSyncService.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRangerBGSyncService.java
index a173bd9222..4bdc29d614 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRangerBGSyncService.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRangerBGSyncService.java
@@ -65,7 +65,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import static org.apache.hadoop.hdds.scm.HddsTestUtils.mockRemoteUser;
@@ -106,6 +105,8 @@ public class TestRangerBGSyncService {
@TempDir
private Path folder;
+ @TempDir
+ private String path;
private MultiTenantAccessController accessController;
private OMRangerBGSyncService bgSync;
@@ -181,8 +182,6 @@ public class TestRangerBGSyncService {
// Run as alice, so that Server.getRemoteUser() won't return null.
mockRemoteUser(ugiAlice);
- String omID = UUID.randomUUID().toString();
- final String path = GenericTestUtils.getTempPath(omID);
Path metaDirPath = Paths.get(path, "om-meta");
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, metaDirPath.toString());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
index 1a661ecdd7..bcca0d51d1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
@@ -40,7 +40,6 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.FileChecksum;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.TrashPolicy;
import org.apache.hadoop.hdds.cli.GenericCli;
@@ -112,6 +111,7 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.Logger;
@@ -136,12 +136,13 @@ public class TestOzoneShellHA {
LoggerFactory.getLogger(TestOzoneShellHA.class);
private static final String DEFAULT_ENCODING = UTF_8.name();
-
- private static File baseDir;
+ @TempDir
+ private static java.nio.file.Path path;
+ @TempDir
+ private static File kmsDir;
private static File testFile;
private static String testFilePathString;
private static MiniOzoneHAClusterImpl cluster = null;
- private static File testDir;
private static MiniKMS miniKMS;
private static OzoneClient client;
private OzoneShell ozoneShell = null;
@@ -173,20 +174,12 @@ public class TestOzoneShellHA {
}
protected static void startKMS() throws Exception {
- testDir = GenericTestUtils.getTestDir(
- TestOzoneShellHA.class.getSimpleName());
- File kmsDir = new File(testDir, UUID.randomUUID().toString());
- assertTrue(kmsDir.mkdirs());
MiniKMS.Builder miniKMSBuilder = new MiniKMS.Builder();
miniKMS = miniKMSBuilder.setKmsConfDir(kmsDir).build();
miniKMS.start();
}
protected static void startCluster(OzoneConfiguration conf) throws Exception
{
- String path = GenericTestUtils.getTempPath(
- TestOzoneShellHA.class.getSimpleName());
- baseDir = new File(path);
- baseDir.mkdirs();
testFilePathString = path + OZONE_URI_DELIMITER + "testFile";
testFile = new File(testFilePathString);
@@ -225,14 +218,6 @@ public class TestOzoneShellHA {
if (miniKMS != null) {
miniKMS.stop();
}
-
- if (baseDir != null) {
- FileUtil.fullyDelete(baseDir, true);
- }
-
- if (testDir != null) {
- FileUtil.fullyDelete(testDir, true);
- }
}
@BeforeEach
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
index 5d64750714..09770b097f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
@@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.io.retry.RetryInvocationHandler;
@@ -44,6 +43,7 @@ import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
@@ -54,6 +54,7 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
+import java.nio.file.Path;
import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
import java.util.List;
@@ -91,7 +92,8 @@ public class TestOzoneTenantShell {
* Set the timeout for every test.
*/
- private static File baseDir;
+ @TempDir
+ private static Path path;
private static File testFile;
private static final File AUDIT_LOG_FILE = new File("audit.log");
@@ -137,11 +139,6 @@ public class TestOzoneTenantShell {
conf.setBoolean(OZONE_OM_TENANT_DEV_SKIP_RANGER, true);
}
- String path = GenericTestUtils.getTempPath(
- TestOzoneTenantShell.class.getSimpleName());
- baseDir = new File(path);
- baseDir.mkdirs();
-
testFile = new File(path + OzoneConsts.OZONE_URI_DELIMITER + "testFile");
testFile.getParentFile().mkdirs();
testFile.createNewFile();
@@ -169,10 +166,6 @@ public class TestOzoneTenantShell {
cluster.shutdown();
}
- if (baseDir != null) {
- FileUtil.fullyDelete(baseDir, true);
- }
-
if (AUDIT_LOG_FILE.exists()) {
AUDIT_LOG_FILE.delete();
}
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/genconf/TestGenerateOzoneRequiredConfigurations.java
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/genconf/TestGenerateOzoneRequiredConfigurations.java
index 5b580c81c0..6d26445668 100644
---
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/genconf/TestGenerateOzoneRequiredConfigurations.java
+++
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/genconf/TestGenerateOzoneRequiredConfigurations.java
@@ -18,16 +18,13 @@
package org.apache.hadoop.ozone.genconf;
-import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.ozone.test.GenericTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
@@ -40,7 +37,6 @@ import picocli.CommandLine.ParameterException;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.IOException;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
import java.net.URL;
@@ -54,7 +50,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
* Tests GenerateOzoneRequiredConfigurations.
*/
public class TestGenerateOzoneRequiredConfigurations {
- private static File outputBaseDir;
+
private static GenerateOzoneRequiredConfigurations genconfTool;
private static final Logger LOG =
LoggerFactory.getLogger(TestGenerateOzoneRequiredConfigurations.class);
@@ -72,8 +68,6 @@ public class TestGenerateOzoneRequiredConfigurations {
*/
@BeforeAll
public static void init() throws Exception {
- outputBaseDir = GenericTestUtils.getTestDir();
- FileUtils.forceMkdir(outputBaseDir);
genconfTool = new GenerateOzoneRequiredConfigurations();
}
@@ -94,14 +88,6 @@ public class TestGenerateOzoneRequiredConfigurations {
System.setErr(OLD_ERR);
}
- /**
- * Cleans up the output base directory.
- */
- @AfterAll
- public static void cleanup() throws IOException {
- FileUtils.deleteDirectory(outputBaseDir);
- }
-
private void execute(String[] args, String msg)
throws UnsupportedEncodingException {
List<String> arguments = new ArrayList(Arrays.asList(args));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
