This is an automated email from the ASF dual-hosted git repository.
arp 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 387c53781a HDDS-9067. Unit check aborted due to No space left on
device (#5129)
387c53781a is described below
commit 387c53781aae03f944906a0add58f51250d36687
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Aug 2 17:22:25 2023 +0200
HDDS-9067. Unit check aborted due to No space left on device (#5129)
---
.../ozone/container/common/SCMTestUtils.java | 25 +++++++++++---
.../TestKeyValueContainerMarkUnhealthy.java | 12 +++----
.../container/keyvalue/TestKeyValueHandler.java | 8 ++---
.../container/stream/TestStreamingServer.java | 24 ++++++-------
.../scm/container/TestContainerReportHandler.java | 2 +-
.../scm/container/TestContainerStateManager.java | 2 +-
.../TestIncrementalContainerReportHandler.java | 3 +-
.../scm/container/TestUnknownContainerReport.java | 2 +-
.../replication/TestLegacyReplicationManager.java | 20 +++--------
.../hadoop/hdds/scm/ha/TestSCMHAManagerImpl.java | 40 ++++++----------------
.../ha/TestStatefulServiceStateManagerImpl.java | 12 +++----
.../hdds/scm/node/TestContainerPlacement.java | 3 +-
.../hdds/scm/node/TestNodeDecommissionManager.java | 11 +++---
.../hadoop/hdds/scm/node/TestStatisticsUpdate.java | 22 +++++-------
.../TestPipelineDatanodesIntersection.java | 4 +--
.../hdds/scm/pipeline/TestPipelineManagerImpl.java | 10 ++----
.../scm/pipeline/TestPipelinePlacementFactory.java | 11 ++----
.../scm/pipeline/TestPipelinePlacementPolicy.java | 3 +-
.../scm/pipeline/TestPipelineStateManagerImpl.java | 3 +-
.../scm/pipeline/TestRatisPipelineProvider.java | 14 +++-----
.../scm/pipeline/TestSimplePipelineProvider.java | 3 +-
.../pipeline/TestWritableECContainerProvider.java | 7 ++--
.../scm/security/TestRootCARotationManager.java | 3 +-
.../scm/server/TestSCMBlockProtocolServer.java | 10 +++---
.../scm/server/TestSCMClientProtocolServer.java | 10 ++----
.../ozone/container/common/TestEndPoint.java | 12 ++-----
.../org/apache/ozone/test/GenericTestUtils.java | 6 ++--
.../hadoop/hdds/scm/TestSCMInstallSnapshot.java | 8 ++---
.../hdds/scm/pipeline/TestLeaderChoosePolicy.java | 3 --
.../TestRatisPipelineCreateAndDestroy.java | 3 --
.../apache/hadoop/ozone/TestMiniOzoneCluster.java | 16 ++-------
.../TestOMSnapshotPurgeRequestAndResponse.java | 5 ++-
.../security/acl/TestOzoneNativeAuthorizer.java | 12 +++++--
.../hadoop/ozone/security/acl/TestParentAcl.java | 12 +++++--
.../hadoop/ozone/security/acl/TestVolumeOwner.java | 12 +++++--
.../src/test/resources/log4j.properties | 25 ++++++++++++++
.../TestStorageContainerServiceProviderImpl.java | 5 ++-
37 files changed, 175 insertions(+), 208 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/SCMTestUtils.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/SCMTestUtils.java
index f74b0184d9..91935e0d04 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/SCMTestUtils.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/SCMTestUtils.java
@@ -16,11 +16,13 @@
*/
package org.apache.hadoop.ozone.container.common;
+import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
+import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
@@ -41,9 +43,11 @@ import
org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolServer
import org.apache.ozone.test.GenericTestUtils;
import com.google.protobuf.BlockingService;
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_KEY;
import org.mockito.Mockito;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
+import static org.apache.logging.log4j.util.StackLocatorUtil.getCallerClass;
+
/**
* Test Endpoint class.
*/
@@ -122,11 +126,22 @@ public final class SCMTestUtils {
}
public static OzoneConfiguration getConf() {
+ String name = getCallerClass(2).getSimpleName()
+ + "-" + randomAlphanumeric(10);
+ File testDir = GenericTestUtils.getTestDir(name);
+ Runtime.getRuntime().addShutdownHook(new Thread(
+ () -> FileUtils.deleteQuietly(testDir)));
+ return getConf(testDir);
+ }
+
+ public static OzoneConfiguration getConf(File testDir) {
OzoneConfiguration conf = new OzoneConfiguration();
- conf.set(HDDS_DATANODE_DIR_KEY, GenericTestUtils
- .getRandomizedTempPath());
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, GenericTestUtils
- .getRandomizedTempPath());
+ conf.set(ScmConfigKeys.HDDS_DATANODE_DIR_KEY,
+ new File(testDir, "datanode").getAbsolutePath());
+ conf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
+ new File(testDir, "metadata").getAbsolutePath());
+ conf.set(ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR,
+ new File(testDir, "datanodeID").getAbsolutePath());
conf.setClass(SpaceUsageCheckFactory.Conf.configKeyForClassName(),
MockSpaceUsageCheckFactory.None.class,
SpaceUsageCheckFactory.class);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java
index a8da836835..43b2c7933c 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java
@@ -27,7 +27,6 @@ import
org.apache.hadoop.ozone.container.common.volume.HddsVolume;
import
org.apache.hadoop.ozone.container.common.volume.RoundRobinVolumeChoosingPolicy;
import org.apache.hadoop.ozone.container.common.volume.VolumeSet;
import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -94,9 +93,11 @@ public class TestKeyValueContainerMarkUnhealthy {
public void setUp() throws Exception {
conf = new OzoneConfiguration();
datanodeId = UUID.randomUUID();
- HddsVolume hddsVolume = new HddsVolume.Builder(folder.getRoot()
- .getAbsolutePath()).conf(conf).datanodeUuid(datanodeId
- .toString()).build();
+ String dataDir = folder.newFolder("data").getAbsolutePath();
+ HddsVolume hddsVolume = new HddsVolume.Builder(dataDir)
+ .conf(conf)
+ .datanodeUuid(datanodeId.toString())
+ .build();
hddsVolume.format(scmId);
hddsVolume.createWorkingDir(scmId, null);
@@ -109,8 +110,7 @@ public class TestKeyValueContainerMarkUnhealthy {
layout,
(long) StorageUnit.GB.toBytes(5), UUID.randomUUID().toString(),
datanodeId.toString());
- final File metaDir = GenericTestUtils.getRandomizedTestDir();
- metaDir.mkdirs();
+ final File metaDir = folder.newFolder("meta");
keyValueContainerData.setMetadataPath(metaDir.getPath());
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
index 745e8a0682..e38a7415c5 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
@@ -84,7 +84,7 @@ import static org.mockito.Mockito.times;
public class TestKeyValueHandler {
@Rule
- public TestRule timeout = Timeout.seconds(300);
+ public final TestRule timeout = Timeout.seconds(300);
@Rule
public final TemporaryFolder tempDir = new TemporaryFolder();
@@ -264,7 +264,7 @@ public class TestKeyValueHandler {
@Test
public void testVolumeSetInKeyValueHandler() throws Exception {
- File path = GenericTestUtils.getRandomizedTestDir();
+ File path = tempDir.newFolder();
OzoneConfiguration conf = new OzoneConfiguration();
conf.set(HDDS_DATANODE_DIR_KEY, path.getAbsolutePath());
conf.set(OZONE_METADATA_DIRS, path.getAbsolutePath());
@@ -357,9 +357,7 @@ public class TestKeyValueHandler {
@SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
@Test
public void testDeleteContainer() throws IOException {
- final String testDir = GenericTestUtils.getTempPath(
- TestKeyValueHandler.class.getSimpleName() +
- "-" + UUID.randomUUID().toString());
+ final String testDir = tempDir.newFolder().getAbsolutePath();
try {
// Case 1 : Regular container delete
final long containerID = 1L;
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/stream/TestStreamingServer.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/stream/TestStreamingServer.java
index d88df82315..b63f0ed56f 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/stream/TestStreamingServer.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/stream/TestStreamingServer.java
@@ -21,9 +21,9 @@ import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import io.netty.handler.ssl.util.SelfSignedCertificate;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -42,10 +42,13 @@ public class TestStreamingServer {
private static final byte[] CONTENT = "Stream it if you can"
.getBytes(StandardCharsets.UTF_8);
+ @TempDir
+ private Path sourceDir;
+ @TempDir
+ private Path destDir;
+
@Test
public void simpleStream() throws Exception {
- Path sourceDir = GenericTestUtils.getRandomizedTestDir().toPath();
- Path destDir = GenericTestUtils.getRandomizedTestDir().toPath();
Files.createDirectories(sourceDir.resolve(SUBDIR));
Files.createDirectories(destDir.resolve(SUBDIR));
@@ -53,7 +56,7 @@ public class TestStreamingServer {
Files.write(sourceDir.resolve(SUBDIR).resolve("file1"), CONTENT);
//WHEN: stream subdir
- streamDir(sourceDir, destDir, SUBDIR);
+ streamDir(SUBDIR);
//THEN: compare the files
final byte[] targetContent = Files
@@ -75,8 +78,6 @@ public class TestStreamingServer {
.trustManager(InsecureTrustManagerFactory.INSTANCE)
.build();
- Path sourceDir = GenericTestUtils.getRandomizedTestDir().toPath();
- Path destDir = GenericTestUtils.getRandomizedTestDir().toPath();
Files.createDirectories(sourceDir.resolve(SUBDIR));
Files.createDirectories(destDir.resolve(SUBDIR));
@@ -109,8 +110,6 @@ public class TestStreamingServer {
}
@Test
public void failedStream() throws Exception {
- Path sourceDir = GenericTestUtils.getRandomizedTestDir().toPath();
- Path destDir = GenericTestUtils.getRandomizedTestDir().toPath();
Files.createDirectories(sourceDir.resolve(SUBDIR));
Files.createDirectories(destDir.resolve(SUBDIR));
@@ -118,8 +117,8 @@ public class TestStreamingServer {
Files.write(sourceDir.resolve(SUBDIR).resolve("file1"), CONTENT);
//WHEN: stream subdir
- Assertions.assertThrows(RuntimeException.class, () ->
- streamDir(sourceDir, destDir, "NO_SUCH_ID"));
+ Assertions.assertThrows(RuntimeException.class,
+ () -> streamDir("NO_SUCH_ID"));
//THEN: compare the files
//exception is expected
@@ -128,8 +127,6 @@ public class TestStreamingServer {
@Test
public void timeout() throws Exception {
- Path sourceDir = GenericTestUtils.getRandomizedTestDir().toPath();
- Path destDir = GenericTestUtils.getRandomizedTestDir().toPath();
Files.createDirectories(sourceDir.resolve(SUBDIR));
Files.createDirectories(destDir.resolve(SUBDIR));
@@ -161,8 +158,7 @@ public class TestStreamingServer {
}
- private void streamDir(Path sourceDir, Path destDir, String subdir)
- throws InterruptedException {
+ private void streamDir(String subdir) {
try (StreamingServer server = new StreamingServer(
new DirectoryServerSource(sourceDir), 0)) {
server.start();
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
index 9fef229c7f..9627092fa6 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
@@ -98,7 +98,7 @@ public class TestContainerReportHandler {
nodeManager = new MockNodeManager(true, 10);
containerManager = Mockito.mock(ContainerManager.class);
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestContainerReportHandler.class.getSimpleName() + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
index f7f2714119..233cd5c4d9 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
@@ -72,7 +72,7 @@ public class TestContainerStateManager {
OzoneConfiguration conf = new OzoneConfiguration();
scmhaManager = SCMHAManagerStub.getInstance(true);
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestContainerStateManager.class.getSimpleName() + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
index 599eb73842..3433e73299 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
@@ -127,7 +127,8 @@ public class TestIncrementalContainerReportHandler {
scmContext, versionManager);
scmhaManager = SCMHAManagerStub.getInstance(true);
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestIncrementalContainerReportHandler.class.getSimpleName()
+ + UUID.randomUUID());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java
index dfe8d30edc..838fecf121 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java
@@ -78,7 +78,7 @@ public class TestUnknownContainerReport {
this.nodeManager = new MockNodeManager(true, 10);
this.containerManager = Mockito.mock(ContainerManager.class);
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestUnknownContainerReport.class.getSimpleName() + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestLegacyReplicationManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestLegacyReplicationManager.java
index 8bf22b64a1..8a3c8b71e8 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestLegacyReplicationManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestLegacyReplicationManager.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm.container.replication;
-import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
@@ -39,7 +38,6 @@ import
org.apache.hadoop.hdds.scm.container.ContainerStateManager;
import org.apache.hadoop.hdds.scm.container.ContainerStateManagerImpl;
import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport;
import org.apache.hadoop.hdds.scm.container.SimpleMockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import org.apache.hadoop.hdds.scm.container.balancer.MoveManager;
import
org.apache.hadoop.hdds.scm.container.replication.LegacyReplicationManager.LegacyReplicationManagerConfiguration;
import
org.apache.hadoop.hdds.scm.container.replication.ReplicationManager.ReplicationManagerConfiguration;
@@ -64,6 +62,7 @@ import org.apache.hadoop.hdds.server.events.EventQueue;
import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import org.apache.hadoop.hdds.utils.db.LongCodec;
import
org.apache.hadoop.ozone.common.statemachine.InvalidStateTransitionException;
+import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.TestClock;
@@ -77,7 +76,6 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.Mockito;
-import java.io.File;
import java.io.IOException;
import java.time.Clock;
import java.time.Instant;
@@ -134,7 +132,6 @@ public class TestLegacyReplicationManager {
private GenericTestUtils.LogCapturer scmLogs;
private SCMServiceManager serviceManager;
private TestClock clock;
- private File testDir;
private DBStore dbStore;
private ContainerReplicaPendingOps containerReplicaPendingOps;
@@ -144,10 +141,9 @@ public class TestLegacyReplicationManager {
}
@BeforeEach
- public void setup()
- throws IOException, InterruptedException,
+ void setup() throws IOException, InterruptedException,
NodeNotFoundException, InvalidStateTransitionException {
- OzoneConfiguration conf = new OzoneConfiguration();
+ OzoneConfiguration conf = SCMTestUtils.getConf();
conf.setTimeDuration(
HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT,
0, TimeUnit.SECONDS);
@@ -158,9 +154,6 @@ public class TestLegacyReplicationManager {
nodeManager = new SimpleMockNodeManager();
eventQueue = new EventQueue();
SCMHAManager scmhaManager = SCMHAManagerStub.getInstance(true);
- testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
PipelineManager pipelineManager = Mockito.mock(PipelineManager.class);
@@ -250,11 +243,7 @@ public class TestLegacyReplicationManager {
void createReplicationManager(ReplicationManagerConfiguration rmConf,
LegacyReplicationManagerConfiguration lrmConf)
throws InterruptedException, IOException {
- OzoneConfiguration config = new OzoneConfiguration();
- testDir = GenericTestUtils
- .getTestDir(TestContainerManagerImpl.class.getSimpleName());
- config.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- testDir.getAbsolutePath());
+ OzoneConfiguration config = SCMTestUtils.getConf();
config.setTimeDuration(
HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT,
0, TimeUnit.SECONDS);
@@ -296,7 +285,6 @@ public class TestLegacyReplicationManager {
if (dbStore != null) {
dbStore.close();
}
- FileUtils.deleteDirectory(testDir);
}
@Nested
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAManagerImpl.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAManagerImpl.java
index 7e99e5e76c..b1c12cdf71 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAManagerImpl.java
@@ -17,9 +17,9 @@
package org.apache.hadoop.hdds.scm.ha;
+import java.nio.file.Path;
import java.time.Clock;
import java.time.ZoneOffset;
-import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.AddSCMRequest;
@@ -49,8 +49,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
-import java.io.File;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.TimeoutException;
@@ -66,17 +66,14 @@ import static org.mockito.Mockito.when;
*/
class TestSCMHAManagerImpl {
- private String storageBaseDir;
+ @TempDir
+ private Path storageBaseDir;
private String clusterID;
private SCMHAManager primarySCMHAManager;
- private final int waitForClusterToBeReadyTimeout = 10000;
@BeforeEach
- public void setup() throws IOException, InterruptedException,
+ void setup() throws IOException, InterruptedException,
TimeoutException {
- storageBaseDir = GenericTestUtils.getTempPath(
- TestSCMHAManagerImpl.class.getSimpleName() + "-" +
- UUID.randomUUID());
clusterID = UUID.randomUUID().toString();
OzoneConfiguration conf = getConfig("scm1", 9894);
final StorageContainerManager scm = getMockStorageContainerManager(conf);
@@ -92,10 +89,10 @@ class TestSCMHAManagerImpl {
private OzoneConfiguration getConfig(String scmId, int ratisPort) {
OzoneConfiguration conf = new OzoneConfiguration();
- conf.set(ScmConfigKeys.OZONE_SCM_HA_RATIS_STORAGE_DIR, storageBaseDir
- + File.separator + scmId + File.separator + "ratis");
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, storageBaseDir
- + File.separator + scmId + File.separator + "metadata");
+ conf.set(ScmConfigKeys.OZONE_SCM_HA_RATIS_STORAGE_DIR,
+ storageBaseDir.resolve(scmId).resolve("ratis").toString());
+ conf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
+ storageBaseDir.resolve(scmId).resolve("metadata").toString());
conf.set(ScmConfigKeys.OZONE_SCM_RATIS_PORT_KEY,
String.valueOf(ratisPort));
return conf;
}
@@ -104,13 +101,12 @@ class TestSCMHAManagerImpl {
throws TimeoutException,
InterruptedException {
GenericTestUtils.waitFor(ratisDivision::isLeaderReady,
- 1000, waitForClusterToBeReadyTimeout);
+ 1000, 10000);
}
@AfterEach
public void cleanup() throws IOException {
primarySCMHAManager.stop();
- FileUtils.deleteDirectory(new File(storageBaseDir));
}
@Test
@@ -135,26 +131,12 @@ class TestSCMHAManagerImpl {
}
}
- private StorageContainerManager testsetup() throws Exception {
- OzoneConfiguration config = new OzoneConfiguration();
- config.set(ScmConfigKeys.OZONE_SCM_PRIMORDIAL_NODE_ID_KEY, "scm1");
- File dir = GenericTestUtils.getRandomizedTestDir();
- config.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.toString());
- SCMConfigurator configurator = new SCMConfigurator();
- configurator.setSCMHAManager(SCMHAManagerStub.getInstance(true));
- configurator.setScmContext(SCMContext.emptyContext());
- configurator.setSCMHAManager(primarySCMHAManager);
- StorageContainerManager scm = HddsTestUtils.getScm(config, configurator);
-
- return scm;
- }
@Test
public void testHARingRemovalErrors() throws IOException,
AuthenticationException {
OzoneConfiguration config = new OzoneConfiguration();
config.set(ScmConfigKeys.OZONE_SCM_PRIMORDIAL_NODE_ID_KEY, "scm1");
- File dir = GenericTestUtils.getRandomizedTestDir();
- config.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.toString());
+ config.set(HddsConfigKeys.OZONE_METADATA_DIRS, storageBaseDir.toString());
SCMConfigurator configurator = new SCMConfigurator();
configurator.setSCMHAManager(SCMHAManagerStub.getInstance(true));
configurator.setScmContext(SCMContext.emptyContext());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestStatefulServiceStateManagerImpl.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestStatefulServiceStateManagerImpl.java
index 3ea459419b..c80c15849c 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestStatefulServiceStateManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestStatefulServiceStateManagerImpl.java
@@ -19,20 +19,20 @@
package org.apache.hadoop.hdds.scm.ha;
import com.google.protobuf.ByteString;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.metadata.SCMDBDefinition;
import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import org.apache.hadoop.hdds.utils.db.Table;
-import
org.apache.hadoop.security.authentication.client.AuthenticationException;
-import org.apache.ozone.test.GenericTestUtils;
+import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import java.io.File;
import java.io.IOException;
/**
@@ -46,11 +46,9 @@ public class TestStatefulServiceStateManagerImpl {
private StatefulServiceStateManager stateManager;
@BeforeEach
- public void setup() throws AuthenticationException, IOException {
- conf = new OzoneConfiguration();
+ void setup(@TempDir File testDir) throws IOException {
+ conf = SCMTestUtils.getConf(testDir);
conf.setBoolean(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY, true);
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- GenericTestUtils.getRandomizedTempPath());
dbStore = DBStoreBuilder.createDBStore(conf, new SCMDBDefinition());
statefulServiceConfig =
SCMDBDefinition.STATEFUL_SERVICE_CONFIG.getTable(dbStore);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
index 8d65d1bcaa..45895daaaa 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.apache.hadoop.hdds.scm.container.ContainerManager;
import org.apache.hadoop.hdds.scm.container.ContainerManagerImpl;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import
org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementCapacity;
import
org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaPendingOps;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
@@ -95,7 +94,7 @@ public class TestContainerPlacement {
public void setUp() throws Exception {
conf = getConf();
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestContainerPlacement.class.getSimpleName() + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
index 7922aa13de..f4e02a495a 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
@@ -29,9 +29,11 @@ import
org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.server.events.EventQueue;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.UUID;
@@ -51,14 +53,11 @@ public class TestNodeDecommissionManager {
private StorageContainerManager scm;
private NodeManager nodeManager;
private OzoneConfiguration conf;
- private String storageDir;
@BeforeEach
- public void setup() throws Exception {
+ void setup(@TempDir File dir) throws Exception {
conf = new OzoneConfiguration();
- storageDir = GenericTestUtils.getTempPath(
- TestDeadNodeHandler.class.getSimpleName() + UUID.randomUUID());
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, storageDir);
+ conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.getAbsolutePath());
nodeManager = createNodeManager(conf);
decom = new NodeDecommissionManager(conf, nodeManager, null,
SCMContext.emptyContext(), new EventQueue(), null);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestStatisticsUpdate.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestStatisticsUpdate.java
index 436ecff233..5e68471947 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestStatisticsUpdate.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestStatisticsUpdate.java
@@ -39,19 +39,20 @@ import
org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.hdds.server.events.EventQueue;
+import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.apache.hadoop.ozone.upgrade.LayoutVersionManager;
import org.apache.hadoop.security.authentication.client
.AuthenticationException;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
+import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
-import java.util.UUID;
/**
* Verifies the statics in NodeManager.
@@ -62,11 +63,9 @@ public class TestStatisticsUpdate {
private NodeReportHandler nodeReportHandler;
@BeforeEach
- public void setup() throws IOException, AuthenticationException {
- final OzoneConfiguration conf = new OzoneConfiguration();
- final String storageDir = GenericTestUtils.getTempPath(
- TestDeadNodeHandler.class.getSimpleName() + UUID.randomUUID());
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, storageDir);
+ void setup(@TempDir File testDir)
+ throws IOException, AuthenticationException {
+ final OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
conf.set(HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL, "100ms");
conf.set(ScmConfigKeys.OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, "50ms");
conf.set(ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL, "1s");
@@ -87,15 +86,10 @@ public class TestStatisticsUpdate {
DatanodeDetails datanode1 = MockDatanodeDetails.randomDatanodeDetails();
DatanodeDetails datanode2 = MockDatanodeDetails.randomDatanodeDetails();
- String storagePath1 = GenericTestUtils.getRandomizedTempPath()
- .concat("/" + datanode1.getUuidString());
- String storagePath2 = GenericTestUtils.getRandomizedTempPath()
- .concat("/" + datanode2.getUuidString());
-
StorageReportProto storageOne = HddsTestUtils.createStorageReport(
- datanode1.getUuid(), storagePath1, 100, 10, 90, null);
+ datanode1.getUuid(), datanode1.getUuidString(), 100, 10, 90, null);
StorageReportProto storageTwo = HddsTestUtils.createStorageReport(
- datanode2.getUuid(), storagePath2, 200, 20, 180, null);
+ datanode2.getUuid(), datanode2.getUuidString(), 200, 20, 180, null);
nodeManager.register(datanode1,
HddsTestUtils.createNodeReport(Arrays.asList(storageOne),
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java
index dcc3829cce..1e3f929874 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerStub;
import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
@@ -70,7 +69,8 @@ public class TestPipelineDatanodesIntersection {
conf = SCMTestUtils.getConf();
end = false;
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestPipelineDatanodesIntersection.class.getSimpleName()
+ + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java
index 23b71f278f..33243b650e 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hdds.scm.pipeline;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
@@ -65,6 +64,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.ArgumentCaptor;
import org.slf4j.LoggerFactory;
@@ -113,7 +113,6 @@ import static org.mockito.Mockito.when;
*/
public class TestPipelineManagerImpl {
private OzoneConfiguration conf;
- private File testDir;
private DBStore dbStore;
private MockNodeManager nodeManager;
private int maxPipelineCount;
@@ -123,13 +122,9 @@ public class TestPipelineManagerImpl {
private TestClock testClock;
@BeforeEach
- public void init() throws Exception {
+ void init(@TempDir File testDir) throws Exception {
testClock = new TestClock(Instant.now(), ZoneOffset.UTC);
conf = SCMTestUtils.getConf();
- testDir = GenericTestUtils.getTestDir(
- TestPipelineManagerImpl.class.getSimpleName() + UUID.randomUUID());
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- GenericTestUtils.getRandomizedTempPath());
scm = HddsTestUtils.getScm(conf);
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
// Mock Node Manager is not able to correctly set up things for the EC
@@ -155,7 +150,6 @@ public class TestPipelineManagerImpl {
if (dbStore != null) {
dbStore.close();
}
- FileUtil.fullyDelete(testDir);
}
private PipelineManagerImpl createPipelineManager(boolean isLeader)
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
index 44ccbd3548..4288676f67 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.io.File;
import java.util.List;
-import java.util.UUID;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -35,7 +34,6 @@ import
org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolPro
import org.apache.hadoop.hdds.scm.HddsTestUtils;
import org.apache.hadoop.hdds.scm.PlacementPolicy;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import
org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementRackScatter;
import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerStub;
@@ -49,10 +47,10 @@ import org.apache.hadoop.hdds.scm.node.NodeStatus;
import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN;
@@ -73,16 +71,16 @@ public class TestPipelinePlacementFactory {
private NetworkTopologyImpl cluster;
private final List<DatanodeDetails> datanodes = new ArrayList<>();
private final List<DatanodeInfo> dnInfos = new ArrayList<>();
- private File testDir;
private DBStore dbStore;
private SCMHAManager scmhaManager;
private static final long STORAGE_CAPACITY = 100L;
@BeforeEach
- public void setup() {
+ public void setup(@TempDir File testDir) {
//initialize ozone config for tests
conf = new OzoneConfiguration();
+ conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
}
private void setupRacks(int datanodeCount, int nodesPerRack,
@@ -133,9 +131,6 @@ public class TestPipelinePlacementFactory {
.thenReturn(dn);
}
- testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
scmhaManager = SCMHAManagerStub.getInstance(true);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java
index ceb5d24f58..325cb671af 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java
@@ -40,7 +40,6 @@ import
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
import org.apache.hadoop.hdds.scm.ContainerPlacementStatus;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerStub;
import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
@@ -107,7 +106,7 @@ public class TestPipelinePlacementPolicy {
10, StorageUnit.MB);
nodeManager.setNumPipelinePerDatanode(PIPELINE_LOAD_LIMIT);
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestPipelinePlacementPolicy.class.getSimpleName() + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineStateManagerImpl.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineStateManagerImpl.java
index 93a51ce1df..98feedc3b1 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineStateManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineStateManagerImpl.java
@@ -30,7 +30,6 @@ import
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerStub;
import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
@@ -68,7 +67,7 @@ public class TestPipelineStateManagerImpl {
public void init() throws Exception {
final OzoneConfiguration conf = SCMTestUtils.getConf();
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestPipelineStateManagerImpl.class.getSimpleName() +
UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
index 1d3d1ae473..3d9a0313ee 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.ContainerReplica;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import
org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementRackScatter;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerStub;
@@ -43,6 +42,7 @@ import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import org.apache.hadoop.ozone.ClientVersion;
import org.apache.ozone.test.GenericTestUtils;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.Assume;
import org.junit.jupiter.api.Test;
@@ -89,7 +89,7 @@ public class TestRatisPipelineProvider {
public void init(int maxPipelinePerNode, OzoneConfiguration conf)
throws Exception {
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestRatisPipelineProvider.class.getSimpleName() + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
@@ -108,7 +108,8 @@ public class TestRatisPipelineProvider {
stateManager, conf);
}
- private void cleanup() throws Exception {
+ @AfterEach
+ void cleanup() throws Exception {
if (dbStore != null) {
dbStore.close();
}
@@ -160,14 +161,12 @@ public class TestRatisPipelineProvider {
public void testCreatePipelineWithFactorThree() throws Exception {
init(1);
createPipelineAndAssertions(HddsProtos.ReplicationFactor.THREE);
- cleanup();
}
@Test
public void testCreatePipelineWithFactorOne() throws Exception {
init(1);
createPipelineAndAssertions(HddsProtos.ReplicationFactor.ONE);
- cleanup();
}
private List<DatanodeDetails> createListOfNodes(int nodeCount) {
@@ -201,7 +200,6 @@ public class TestRatisPipelineProvider {
// With enough pipeline quote on datanodes, they should not share
// the same set of datanodes.
assertNotEquals(pipeline.getNodeSet(), pipeline1.getNodeSet());
- cleanup();
}
@Test
@@ -219,7 +217,6 @@ public class TestRatisPipelineProvider {
createListOfNodes(factor.getNumber()));
assertPipelineProperties(pipeline, factor, REPLICATION_TYPE,
Pipeline.PipelineState.OPEN);
- cleanup();
}
@Test
@@ -243,7 +240,6 @@ public class TestRatisPipelineProvider {
Assertions.assertEquals(pipeline1.getNodeSet(), pipeline2.getNodeSet());
Assertions.assertEquals(pipeline2.getNodeSet(), pipeline3.getNodeSet());
- cleanup();
}
@Test
@@ -292,7 +288,6 @@ public class TestRatisPipelineProvider {
assertTrue(
nodes.stream().anyMatch(membersOfClosedPipelines::contains),
"at least 1 node should have been from members of closed pipelines");
- cleanup();
}
@Test
@@ -375,7 +370,6 @@ public class TestRatisPipelineProvider {
Assertions.assertTrue(ex.getMessage().contains(expectedErrorSubstring));
}
}
- cleanup();
}
private void addPipeline(
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java
index 8f7975c192..bc9aa58c2b 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java
@@ -26,7 +26,6 @@ import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerStub;
import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
import org.apache.hadoop.hdds.scm.metadata.SCMDBDefinition;
@@ -63,7 +62,7 @@ public class TestSimplePipelineProvider {
nodeManager = new MockNodeManager(true, 10);
final OzoneConfiguration conf = SCMTestUtils.getConf();
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestSimplePipelineProvider.class.getSimpleName() + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestWritableECContainerProvider.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestWritableECContainerProvider.java
index 87c7f151b6..d989685423 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestWritableECContainerProvider.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestWritableECContainerProvider.java
@@ -30,7 +30,6 @@ import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.apache.hadoop.hdds.scm.container.ContainerManager;
import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerStub;
@@ -43,6 +42,7 @@ import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.Assert;
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.MethodSource;
import org.junit.runners.Parameterized;
@@ -59,7 +59,6 @@ import java.util.List;
import java.util.Map;
import java.util.NavigableSet;
import java.util.Set;
-import java.util.UUID;
import static org.apache.hadoop.hdds.conf.StorageUnit.BYTES;
import static
org.apache.hadoop.hdds.scm.pipeline.Pipeline.PipelineState.CLOSED;
@@ -101,15 +100,13 @@ public class TestWritableECContainerProvider {
}
@BeforeEach
- public void setup() throws IOException {
+ void setup(@TempDir File testDir) throws IOException {
repConfig = new ECReplicationConfig(3, 2);
conf = new OzoneConfiguration();
providerConf = conf.getObject(WritableECContainerProviderConfig.class);
containers = new HashMap<>();
- File testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
index de1d13a5fd..d2d946b89d 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
@@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.scm.container.TestContainerManagerImpl;
import org.apache.hadoop.hdds.scm.ha.SCMContext;
import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
import org.apache.hadoop.hdds.scm.ha.SCMRatisServerImpl;
@@ -93,7 +92,7 @@ public class TestRootCARotationManager {
CertificateException {
ozoneConfig = new OzoneConfiguration();
testDir = GenericTestUtils.getTestDir(
- TestContainerManagerImpl.class.getSimpleName() + UUID.randomUUID());
+ TestRootCARotationManager.class.getSimpleName() + UUID.randomUUID());
ozoneConfig
.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
ozoneConfig
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java
index 7c7a15d198..31d9b20358 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm.server;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.ScmBlockLocationProtocolProtos;
@@ -29,12 +28,13 @@ import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics;
import
org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocolServerSideTranslatorPB;
import org.apache.hadoop.ozone.ClientVersion;
-import org.apache.ozone.test.GenericTestUtils;
+import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
import java.io.File;
@@ -56,10 +56,8 @@ public class TestSCMBlockProtocolServer {
private static final int NODE_COUNT = 10;
@BeforeEach
- public void setUp() throws Exception {
- config = new OzoneConfiguration();
- File dir = GenericTestUtils.getRandomizedTestDir();
- config.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.toString());
+ void setUp(@TempDir File dir) throws Exception {
+ config = SCMTestUtils.getConf(dir);
SCMConfigurator configurator = new SCMConfigurator();
configurator.setSCMHAManager(SCMHAManagerStub.getInstance(true));
configurator.setScmContext(SCMContext.emptyContext());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
index d4bcd8cba7..4e92305765 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hdds.scm.server;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import
org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.DecommissionScmResponseProto;
import
org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.DecommissionScmRequestProto;
@@ -26,9 +25,9 @@ import org.apache.hadoop.hdds.scm.ha.SCMContext;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerStub;
import
org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocolServerSideTranslatorPB;
import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics;
+import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
@@ -39,7 +38,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mockito;
-import java.io.File;
import java.io.IOException;
/**
@@ -53,10 +51,8 @@ public class TestSCMClientProtocolServer {
private StorageContainerLocationProtocolServerSideTranslatorPB service;
@BeforeEach
- public void setUp() throws Exception {
- config = new OzoneConfiguration();
- File dir = GenericTestUtils.getRandomizedTestDir();
- config.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.toString());
+ void setUp() throws Exception {
+ config = SCMTestUtils.getConf();
SCMConfigurator configurator = new SCMConfigurator();
configurator.setSCMHAManager(SCMHAManagerStub.getInstance(true));
configurator.setScmContext(SCMContext.emptyContext());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
index 577bf9f34d..2d40423f01 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -66,11 +65,8 @@ import
org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer;
import
org.apache.hadoop.ozone.container.replication.ReplicationServer.ReplicationConfig;
import org.apache.hadoop.ozone.protocol.commands.CommandStatus;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.hadoop.test.PathUtils;
import org.apache.hadoop.util.Time;
-import static
org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY;
-import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
import static
org.apache.hadoop.ozone.container.upgrade.UpgradeUtils.defaultLayoutVersionProto;
import static
org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager.maxLayoutVersion;
@@ -79,6 +75,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
import static org.mockito.Mockito.mock;
@@ -91,6 +88,7 @@ public class TestEndPoint {
private static InetSocketAddress serverAddress;
private static RPC.Server scmServer;
private static ScmTestMock scmServerImpl;
+ @TempDir
private static File testDir;
@AfterAll
@@ -98,16 +96,14 @@ public class TestEndPoint {
if (scmServer != null) {
scmServer.stop();
}
- FileUtil.fullyDelete(testDir);
}
@BeforeAll
- public static void setUp() throws Exception {
+ static void setUp() throws Exception {
serverAddress = SCMTestUtils.getReuseableAddress();
scmServerImpl = new ScmTestMock();
scmServer = SCMTestUtils.startScmRpcServer(SCMTestUtils.getConf(),
scmServerImpl, serverAddress, 10);
- testDir = PathUtils.getTestDir(TestEndPoint.class);
}
/**
@@ -529,8 +525,6 @@ public class TestEndPoint {
int rpcTimeout
) throws Exception {
OzoneConfiguration conf = SCMTestUtils.getConf();
- conf.set(DFS_DATANODE_DATA_DIR_KEY, testDir.getAbsolutePath());
- conf.set(OZONE_METADATA_DIRS, testDir.getAbsolutePath());
// Mini Ozone cluster will not come up if the port is not true, since
// Ratis will exit if the server port cannot be bound. We can remove this
// hard coding once we fix the Ratis default behaviour.
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 9cd97eaabb..66647bfba5 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
@@ -31,7 +31,6 @@ import java.util.concurrent.TimeoutException;
import com.google.common.base.Preconditions;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.log4j.Layout;
@@ -46,6 +45,8 @@ import java.util.function.BooleanSupplier;
import java.util.stream.Collectors;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
+import static org.apache.logging.log4j.util.StackLocatorUtil.getCallerClass;
import static org.junit.Assert.assertTrue;
/**
@@ -142,7 +143,8 @@ public abstract class GenericTestUtils {
*/
@SuppressWarnings("java:S2245") // no need for secure random
public static String getRandomizedTempPath() {
- return getTempPath(RandomStringUtils.randomAlphanumeric(10));
+ return getTempPath(getCallerClass(GenericTestUtils.class).getSimpleName()
+ + "-" + randomAlphanumeric(10));
}
/**
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java
index 407ae94664..a37d3c4756 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java
@@ -36,16 +36,17 @@ import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterAll;
import org.junit.Assert;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import java.io.File;
import java.net.InetSocketAddress;
+import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
@@ -60,13 +61,12 @@ public class TestSCMInstallSnapshot {
private static OzoneConfiguration conf;
@BeforeAll
- public static void setup() throws Exception {
+ static void setup(@TempDir Path tempDir) throws Exception {
conf = new OzoneConfiguration();
conf.setBoolean(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY, true);
conf.set(ScmConfigKeys.OZONE_SCM_PIPELINE_CREATION_INTERVAL, "10s");
conf.setLong(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_THRESHOLD, 1L);
- conf.set(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_DIR,
- GenericTestUtils.getRandomizedTempPath() + "/snapshot");
+ conf.set(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_DIR,
tempDir.toString());
cluster = MiniOzoneCluster
.newBuilder(conf)
.setNumDatanodes(3)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java
index 047cf8d28c..e4b59126fb 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hdds.scm.pipeline;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
@@ -55,8 +54,6 @@ public class TestLeaderChoosePolicy {
public void init(int numDatanodes, int datanodePipelineLimit)
throws Exception {
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- GenericTestUtils.getRandomizedTempPath());
conf.setInt(OZONE_DATANODE_PIPELINE_LIMIT, datanodePipelineLimit);
cluster = MiniOzoneCluster.newBuilder(conf)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java
index 022b475e95..a14d8256e1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hdds.scm.pipeline;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -55,8 +54,6 @@ public class TestRatisPipelineCreateAndDestroy {
private PipelineManager pipelineManager;
public void init(int numDatanodes) throws Exception {
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- GenericTestUtils.getRandomizedTempPath());
conf.setInt(OZONE_DATANODE_PIPELINE_LIMIT, 2);
cluster = MiniOzoneCluster.newBuilder(conf)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
index 63b6bdb131..1faa25a5ac 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone;
-import org.apache.hadoop.hdds.DFSConfigKeysLegacy;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -34,15 +33,13 @@ import
org.apache.hadoop.ozone.container.common.SCMTestUtils;
import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
import
org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine;
import org.apache.hadoop.ozone.container.common.volume.StorageVolume;
-import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
-import org.apache.hadoop.test.PathUtils;
-import org.apache.hadoop.test.TestGenericTestUtils;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterEach;
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;
@@ -67,12 +64,10 @@ public class TestMiniOzoneCluster {
private MiniOzoneCluster cluster;
private static OzoneConfiguration conf;
- private static final File TEST_ROOT = TestGenericTestUtils.getTestDir();
-
@BeforeAll
- public static void setup() {
+ static void setup(@TempDir File testDir) {
conf = new OzoneConfiguration();
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, TEST_ROOT.toString());
+ conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
conf.setInt(ScmConfigKeys.OZONE_DATANODE_PIPELINE_LIMIT, 1);
conf.setBoolean(DFS_CONTAINER_RATIS_IPC_RANDOM_PORT, true);
conf.set(ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL, "1s");
@@ -118,11 +113,6 @@ public class TestMiniOzoneCluster {
@Test
public void testContainerRandomPort() throws IOException {
OzoneConfiguration ozoneConf = SCMTestUtils.getConf();
- File testDir = PathUtils.getTestDir(TestOzoneContainer.class);
- ozoneConf.set(DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY,
- testDir.getAbsolutePath());
- ozoneConf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- TEST_ROOT.toString());
// Each instance of SM will create an ozone container
// that bounds to a random port.
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
index 85d7e1f2f8..fc54bc0d89 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
@@ -43,9 +43,9 @@ import
org.apache.hadoop.ozone.om.upgrade.OMLayoutVersionManager;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotPurgeRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.BeforeEach;
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.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -100,8 +100,7 @@ public class TestOMSnapshotPurgeRequestAndResponse {
DOUBLE_BUFFER_HELPER = ((response, transactionIndex) -> null);
@BeforeEach
- public void setup() throws Exception {
- File testDir = GenericTestUtils.getRandomizedTestDir();
+ void setup(@TempDir File testDir) throws Exception {
ozoneManager = Mockito.mock(OzoneManager.class);
OMLayoutVersionManager lvm = mock(OMLayoutVersionManager.class);
when(lvm.isAllowed(anyString())).thenReturn(true);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
index 31a68e6e1a..60d174b739 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
@@ -16,6 +16,7 @@
*/
package org.apache.hadoop.ozone.security.acl;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -42,6 +43,7 @@ import
org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLIdentityType;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.ozone.test.GenericTestUtils;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -86,6 +88,7 @@ import static org.junit.Assert.assertTrue;
public class TestOzoneNativeAuthorizer {
private static final List<String> ADMIN_USERNAMES = singletonList("om");
+ private static File testDir;
private final String vol;
private final String buck;
private String key;
@@ -140,8 +143,8 @@ public class TestOzoneNativeAuthorizer {
OzoneConfiguration ozConfig = new OzoneConfiguration();
ozConfig.set(OZONE_ACL_AUTHORIZER_CLASS,
OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
- File dir = GenericTestUtils.getRandomizedTestDir();
- ozConfig.set(OZONE_METADATA_DIRS, dir.toString());
+ testDir = GenericTestUtils.getRandomizedTestDir();
+ ozConfig.set(OZONE_METADATA_DIRS, testDir.toString());
ozConfig.set(OZONE_ADMINISTRATORS, "om");
OmTestManagers omTestManagers =
@@ -160,6 +163,11 @@ public class TestOzoneNativeAuthorizer {
new String[]{"test"});
}
+ @AfterClass
+ public static void cleanup() throws IOException {
+ FileUtils.deleteDirectory(testDir);
+ }
+
private void createKey(String volume,
String bucket, String keyName) throws IOException {
OmKeyArgs keyArgs = new OmKeyArgs.Builder()
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
index 67929e347a..b5bee0fb5a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.security.acl;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -46,6 +47,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Flaky;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -90,14 +92,15 @@ public class TestParentAcl {
private static UserGroupInformation adminUgi;
private static UserGroupInformation testUgi, testUgi1;
private static OzoneManagerProtocol writeClient;
+ private static File testDir;
@BeforeClass
public static void setup() throws IOException, AuthenticationException {
ozConfig = new OzoneConfiguration();
ozConfig.set(OZONE_ACL_AUTHORIZER_CLASS,
OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
- File dir = GenericTestUtils.getRandomizedTestDir();
- ozConfig.set(OZONE_METADATA_DIRS, dir.toString());
+ testDir = GenericTestUtils.getRandomizedTestDir();
+ ozConfig.set(OZONE_METADATA_DIRS, testDir.toString());
ozConfig.set(OZONE_ADMINISTRATORS, "om");
OmTestManagers omTestManagers =
@@ -119,6 +122,11 @@ public class TestParentAcl {
new String[]{"test1"});
}
+ @AfterClass
+ public static void cleanup() throws IOException {
+ FileUtils.deleteDirectory(testDir);
+ }
+
@Test
@Flaky("HDDS-6335") @Ignore("HDDS-6335")
public void testKeyAcl()
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
index 096d4ff3d8..8f0bf1a6a4 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.security.acl;
+import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -38,6 +39,7 @@ import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.security.UserGroupInformation;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.ozone.test.GenericTestUtils;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -71,14 +73,15 @@ public class TestVolumeOwner {
private static OMMetadataManager metadataManager;
private static UserGroupInformation testUgi;
private static OzoneManagerProtocol writeClient;
+ private static File testDir;
@BeforeClass
public static void setup() throws IOException, AuthenticationException {
ozoneConfig = new OzoneConfiguration();
ozoneConfig.set(OZONE_ACL_AUTHORIZER_CLASS,
OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
- File dir = GenericTestUtils.getRandomizedTestDir();
- ozoneConfig.set(OZONE_METADATA_DIRS, dir.toString());
+ testDir = GenericTestUtils.getRandomizedTestDir();
+ ozoneConfig.set(OZONE_METADATA_DIRS, testDir.toString());
OmTestManagers omTestManagers =
new OmTestManagers(ozoneConfig);
@@ -100,6 +103,11 @@ public class TestVolumeOwner {
prepareTestKeys();
}
+ @AfterClass
+ public static void cleanup() throws IOException {
+ FileUtils.deleteDirectory(testDir);
+ }
+
// create 2 volumes
private static void prepareTestVols() throws IOException {
for (int i = 0; i < 2; i++) {
diff --git a/hadoop-ozone/ozone-manager/src/test/resources/log4j.properties
b/hadoop-ozone/ozone-manager/src/test/resources/log4j.properties
new file mode 100644
index 0000000000..a1e1eaacc0
--- /dev/null
+++ b/hadoop-ozone/ozone-manager/src/test/resources/log4j.properties
@@ -0,0 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# log4j configuration used during build and unit tests
+
+log4j.rootLogger=INFO,stdout
+log4j.threshold=ALL
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2}
(%F:%M(%L)) - %m%n
+log4j.logger.org.apache.hadoop.ozone.om.request.volume.OMVolumeCreateRequest=WARN
+log4j.logger.org.apache.hadoop.ozone.om.request.bucket.OMBucketCreateRequest=WARN
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestStorageContainerServiceProviderImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestStorageContainerServiceProviderImpl.java
index 3fcc4bc766..edcdb58b5e 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestStorageContainerServiceProviderImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestStorageContainerServiceProviderImpl.java
@@ -35,7 +35,6 @@ import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocol;
import org.apache.hadoop.ozone.recon.ReconUtils;
import org.apache.hadoop.ozone.recon.spi.StorageContainerServiceProvider;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -43,6 +42,7 @@ import org.junit.jupiter.api.Test;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import org.junit.jupiter.api.io.TempDir;
/**
* Class to test StorageContainerServiceProviderImpl APIs.
@@ -53,7 +53,7 @@ public class TestStorageContainerServiceProviderImpl {
private HddsProtos.PipelineID pipelineID;
@BeforeEach
- public void setup() {
+ void setup(@TempDir File testDir) {
injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
@@ -61,7 +61,6 @@ public class TestStorageContainerServiceProviderImpl {
StorageContainerLocationProtocol mockScmClient = mock(
StorageContainerLocationProtocol.class);
ReconUtils reconUtils = new ReconUtils();
- File testDir = GenericTestUtils.getRandomizedTestDir();
OzoneConfiguration conf = new OzoneConfiguration();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getPath());
pipelineID = PipelineID.randomId().getProtobuf();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
