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 296d5712b8 HDDS-10243. Replace GenericTestUtils temp dir in
SCMTestUtils (#6154)
296d5712b8 is described below
commit 296d5712b88b10767630ff6ed434f1fe26f1ccfc
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Feb 6 06:37:52 2024 +0100
HDDS-10243. Replace GenericTestUtils temp dir in SCMTestUtils (#6154)
---
.../hadoop/ozone/container/common/SCMTestUtils.java | 13 -------------
.../container/common/TestDatanodeStateMachine.java | 15 ++-------------
.../hdds/scm/TestSCMCommonPlacementPolicy.java | 6 ++++--
.../hadoop/hdds/scm/block/TestBlockManager.java | 7 +++----
.../scm/container/TestContainerManagerImpl.java | 6 ++----
.../scm/container/TestContainerReportHandler.java | 7 ++-----
.../scm/container/TestUnknownContainerReport.java | 4 +---
.../replication/TestECMisReplicationHandler.java | 6 ++++--
.../replication/TestECOverReplicationHandler.java | 6 ++++--
.../replication/TestECUnderReplicationHandler.java | 6 ++++--
.../replication/TestLegacyReplicationManager.java | 13 +++++++++----
.../replication/TestMisReplicationHandler.java | 5 +++--
.../replication/TestRatisMisReplicationHandler.java | 6 ++++--
.../TestRatisUnderReplicationHandler.java | 6 ++++--
.../hadoop/hdds/scm/ha/TestSequenceIDGenerator.java | 13 ++++++++++---
.../pipeline/TestPipelineDatanodesIntersection.java | 4 +---
.../hdds/scm/pipeline/TestPipelineManagerImpl.java | 9 ++++-----
.../scm/pipeline/TestPipelinePlacementPolicy.java | 4 +---
.../scm/pipeline/TestPipelineStateManagerImpl.java | 4 +---
.../scm/pipeline/TestSimplePipelineProvider.java | 4 +---
.../scm/server/TestSCMClientProtocolServer.java | 7 +++++--
.../hadoop/ozone/container/common/TestEndPoint.java | 21 ++++++++++++---------
.../apache/hadoop/ozone/TestMiniOzoneCluster.java | 4 ++--
23 files changed, 83 insertions(+), 93 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 a7f6f53704..7917a4ce55 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
@@ -22,7 +22,6 @@ 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;
@@ -40,12 +39,9 @@ import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.ozone.protocol.StorageContainerDatanodeProtocol;
import org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolPB;
import
org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolServerSideTranslatorPB;
-import org.apache.ozone.test.GenericTestUtils;
import com.google.protobuf.BlockingService;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
-import static org.apache.logging.log4j.util.StackLocatorUtil.getCallerClass;
import static org.mockito.Mockito.mock;
/**
@@ -125,15 +121,6 @@ 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(ScmConfigKeys.HDDS_DATANODE_DIR_KEY,
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
index 57e9613c2d..4f5b87dd3e 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
@@ -28,7 +28,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-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.scm.ScmConfigKeys;
@@ -55,7 +54,6 @@ import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_KEY;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_HEARTBEAT_RPC_TIMEOUT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -80,8 +78,8 @@ public class TestDatanodeStateMachine {
private File testRoot;
@BeforeEach
- public void setUp() throws Exception {
- conf = SCMTestUtils.getConf();
+ void setUp() throws Exception {
+ conf = SCMTestUtils.getConf(testRoot);
conf.setTimeDuration(OZONE_SCM_HEARTBEAT_RPC_TIMEOUT, 500,
TimeUnit.MILLISECONDS);
conf.setBoolean(OzoneConfigKeys.DFS_CONTAINER_RATIS_IPC_RANDOM_PORT, true);
@@ -106,15 +104,6 @@ public class TestDatanodeStateMachine {
conf.setStrings(ScmConfigKeys.OZONE_SCM_NAMES,
serverAddresses.toArray(new String[0]));
- File dataDir = new File(testRoot, "data");
- conf.set(HDDS_DATANODE_DIR_KEY, dataDir.getAbsolutePath());
- if (!dataDir.mkdirs()) {
- LOG.info("Data dir create failed.");
- }
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- new File(testRoot, "scm").getAbsolutePath());
- String path = new File(testRoot, "datanodeID").getAbsolutePath();
- conf.set(ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR, path);
executorService = HadoopExecutors.newCachedThreadPool(
new ThreadFactoryBuilder().setDaemon(true)
.setNameFormat("TestDataNodeStateMachineThread-%d").build());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestSCMCommonPlacementPolicy.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestSCMCommonPlacementPolicy.java
index 6c651cbfac..634a723f28 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestSCMCommonPlacementPolicy.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestSCMCommonPlacementPolicy.java
@@ -37,7 +37,9 @@ import org.apache.hadoop.ozone.container.common.SCMTestUtils;
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.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -72,9 +74,9 @@ public class TestSCMCommonPlacementPolicy {
private OzoneConfiguration conf;
@BeforeEach
- public void setup() {
+ void setup(@TempDir File testDir) {
nodeManager = new MockNodeManager(true, 10);
- conf = SCMTestUtils.getConf();
+ conf = SCMTestUtils.getConf(testDir);
}
@Test
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
index 9d852a1544..6352cbf197 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
@@ -17,10 +17,10 @@
package org.apache.hadoop.hdds.scm.block;
+import java.io.File;
import java.io.IOException;
import java.time.Clock;
import java.time.ZoneId;
-import java.nio.file.Path;
import java.time.ZoneOffset;
import java.util.List;
import java.util.Map;
@@ -114,14 +114,13 @@ public class TestBlockManager {
private ReplicationConfig replicationConfig;
@BeforeEach
- public void setUp(@TempDir Path tempDir) throws Exception {
- conf = SCMTestUtils.getConf();
+ void setUp(@TempDir File tempDir) throws Exception {
+ conf = SCMTestUtils.getConf(tempDir);
numContainerPerOwnerInPipeline = conf.getInt(
ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT,
ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT_DEFAULT);
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, tempDir.toString());
conf.setBoolean(HddsConfigKeys.HDDS_SCM_SAFEMODE_PIPELINE_CREATION, false);
conf.setTimeDuration(HddsConfigKeys.HDDS_PIPELINE_REPORT_INTERVAL, 5,
TimeUnit.SECONDS);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
index 0f861a5077..25a4a80f23 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeoutException;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -74,9 +73,8 @@ public class TestContainerManagerImpl {
private ContainerReplicaPendingOps pendingOpsMock;
@BeforeEach
- public void setUp() throws Exception {
- final OzoneConfiguration conf = SCMTestUtils.getConf();
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
+ void setUp() throws Exception {
+ final OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
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/container/TestContainerReportHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
index 2bdc42b707..695c88d11a 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
@@ -16,7 +16,6 @@
*/
package org.apache.hadoop.hdds.scm.container;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -94,12 +93,10 @@ public class TestContainerReportHandler {
private PipelineManager pipelineManager;
@BeforeEach
- public void setup() throws IOException, InvalidStateTransitionException,
- TimeoutException {
- final OzoneConfiguration conf = SCMTestUtils.getConf();
+ void setup() throws IOException, InvalidStateTransitionException {
+ final OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
nodeManager = new MockNodeManager(true, 10);
containerManager = mock(ContainerManager.class);
- 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/container/TestUnknownContainerReport.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java
index ba16dbff87..9ea4ea45b5 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
@@ -28,7 +28,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Iterator;
-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.HddsProtos.LifeCycleState;
@@ -76,10 +75,9 @@ public class TestUnknownContainerReport {
@BeforeEach
public void setup() throws IOException {
- final OzoneConfiguration conf = SCMTestUtils.getConf();
+ final OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
this.nodeManager = new MockNodeManager(true, 10);
this.containerManager = mock(ContainerManager.class);
- 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/container/replication/TestECMisReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECMisReplicationHandler.java
index b0a77f3a7c..73f6edb468 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECMisReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECMisReplicationHandler.java
@@ -31,9 +31,11 @@ import
org.apache.hadoop.hdds.scm.pipeline.InsufficientDatanodesException;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
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.ValueSource;
+import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
@@ -62,10 +64,10 @@ public class TestECMisReplicationHandler extends
TestMisReplicationHandler {
@BeforeEach
- public void setup() throws NodeNotFoundException,
+ void setup(@TempDir File testDir) throws NodeNotFoundException,
CommandTargetOverloadedException, NotLeaderException {
ECReplicationConfig repConfig = new ECReplicationConfig(DATA, PARITY);
- setup(repConfig);
+ setup(repConfig, testDir);
}
@ParameterizedTest
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECOverReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECOverReplicationHandler.java
index 5b889c3782..50cead87e0 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECOverReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECOverReplicationHandler.java
@@ -41,8 +41,10 @@ import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.stubbing.Answer;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -82,7 +84,7 @@ public class TestECOverReplicationHandler {
private Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent;
@BeforeEach
- public void setup() throws NodeNotFoundException, NotLeaderException,
+ void setup(@TempDir File testDir) throws NodeNotFoundException,
NotLeaderException,
CommandTargetOverloadedException {
staleNode = null;
@@ -103,7 +105,7 @@ public class TestECOverReplicationHandler {
commandsSent);
NodeManager nodeManager = new MockNodeManager(true, 10);
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
ECReplicationConfig repConfig = new ECReplicationConfig(3, 2);
container = ReplicationTestUtil
.createContainer(HddsProtos.LifeCycleState.CLOSED, repConfig);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECUnderReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECUnderReplicationHandler.java
index 3abad7311c..22c3630e0c 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECUnderReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECUnderReplicationHandler.java
@@ -49,9 +49,11 @@ import
org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.assertj.core.util.Lists;
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.ValueSource;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -125,7 +127,7 @@ public class TestECUnderReplicationHandler {
= new AtomicBoolean(false);
@BeforeEach
- public void setup() throws NodeNotFoundException,
+ void setup(@TempDir File testDir) throws NodeNotFoundException,
CommandTargetOverloadedException, NotLeaderException {
nodeManager = new MockNodeManager(true, 10) {
@Override
@@ -159,7 +161,7 @@ public class TestECUnderReplicationHandler {
replicationManager, commandsSent,
throwOverloadedExceptionOnReconstruction);
- conf = SCMTestUtils.getConf();
+ conf = SCMTestUtils.getConf(testDir);
repConfig = new ECReplicationConfig(DATA, PARITY);
container = createContainer(HddsProtos.LifeCycleState.CLOSED, repConfig);
policy = ReplicationTestUtil
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 1dcf15ed65..8aac64de70 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
@@ -77,10 +77,12 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
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;
import org.junit.jupiter.params.provider.ValueSource;
+import java.io.File;
import java.io.IOException;
import java.time.Clock;
import java.time.Instant;
@@ -155,15 +157,18 @@ public class TestLegacyReplicationManager {
private DBStore dbStore;
private ContainerReplicaPendingOps containerReplicaPendingOps;
+ @TempDir
+ private File tempDir;
+
int getInflightCount(InflightType type) {
return replicationManager.getLegacyReplicationManager()
.getInflightCount(type);
}
@BeforeEach
- void setup() throws IOException, InterruptedException,
+ void setup(@TempDir File testDir) throws IOException, InterruptedException,
NodeNotFoundException, InvalidStateTransitionException {
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
conf.setTimeDuration(
HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT,
0, TimeUnit.SECONDS);
@@ -260,10 +265,10 @@ public class TestLegacyReplicationManager {
createReplicationManager(rmConf, null);
}
- void createReplicationManager(ReplicationManagerConfiguration rmConf,
+ private void createReplicationManager(ReplicationManagerConfiguration rmConf,
LegacyReplicationManagerConfiguration lrmConf)
throws InterruptedException, IOException {
- OzoneConfiguration config = SCMTestUtils.getConf();
+ OzoneConfiguration config = SCMTestUtils.getConf(tempDir);
config.setTimeDuration(
HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT,
0, TimeUnit.SECONDS);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestMisReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestMisReplicationHandler.java
index a05f9fe9f3..7746b1db62 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestMisReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestMisReplicationHandler.java
@@ -38,6 +38,7 @@ import
org.apache.hadoop.ozone.protocol.commands.ReplicateContainerCommand;
import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
+import java.io.File;
import java.io.IOException;
import java.util.HashSet;
import java.util.List;
@@ -78,10 +79,10 @@ public abstract class TestMisReplicationHandler {
new AtomicBoolean(false);
private ReplicationManagerMetrics metrics;
- protected void setup(ReplicationConfig repConfig)
+ protected void setup(ReplicationConfig repConfig, File testDir)
throws NodeNotFoundException, CommandTargetOverloadedException,
NotLeaderException {
- conf = SCMTestUtils.getConf();
+ conf = SCMTestUtils.getConf(testDir);
replicationManager = mock(ReplicationManager.class);
when(replicationManager.getNodeStatus(any(DatanodeDetails.class)))
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisMisReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisMisReplicationHandler.java
index 9430ad6f75..d69f0cd755 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisMisReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisMisReplicationHandler.java
@@ -32,9 +32,11 @@ import
org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
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.ValueSource;
+import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
@@ -59,11 +61,11 @@ import static org.mockito.Mockito.any;
public class TestRatisMisReplicationHandler extends TestMisReplicationHandler {
@BeforeEach
- public void setup() throws NodeNotFoundException,
+ void setup(@TempDir File testDir) throws NodeNotFoundException,
CommandTargetOverloadedException, NotLeaderException {
RatisReplicationConfig repConfig = RatisReplicationConfig
.getInstance(ReplicationFactor.THREE);
- setup(repConfig);
+ setup(repConfig, testDir);
}
@ParameterizedTest
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisUnderReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisUnderReplicationHandler.java
index d39ed66ddc..d77f093abe 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisUnderReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisUnderReplicationHandler.java
@@ -41,8 +41,10 @@ import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.ArgumentCaptor;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -89,13 +91,13 @@ public class TestRatisUnderReplicationHandler {
private ReplicationManagerMetrics metrics;
@BeforeEach
- public void setup() throws NodeNotFoundException,
+ void setup(@TempDir File testDir) throws NodeNotFoundException,
CommandTargetOverloadedException, NotLeaderException {
container = ReplicationTestUtil.createContainer(
HddsProtos.LifeCycleState.CLOSED, RATIS_REPLICATION_CONFIG);
nodeManager = mock(NodeManager.class);
- conf = SCMTestUtils.getConf();
+ conf = SCMTestUtils.getConf(testDir);
policy = ReplicationTestUtil
.getSimpleTestPlacementPolicy(nodeManager, conf);
replicationManager = mock(ReplicationManager.class);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSequenceIDGenerator.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSequenceIDGenerator.java
index 08719eff03..2e3c8e8436 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSequenceIDGenerator.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSequenceIDGenerator.java
@@ -25,6 +25,9 @@ import
org.apache.hadoop.hdds.scm.metadata.SCMDBTransactionBufferImpl;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_SEQUENCE_ID_BATCH_SIZE;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,9 +41,13 @@ import static org.mockito.Mockito.when;
* Tests for {@link SequenceIdGenerator}.
*/
public class TestSequenceIDGenerator {
+
+ @TempDir
+ private File testDir;
+
@Test
public void testSequenceIDGenUponNonRatis() throws Exception {
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
SCMMetadataStore scmMetadataStore = new SCMMetadataStoreImpl(conf);
scmMetadataStore.start(conf);
@@ -82,7 +89,7 @@ public class TestSequenceIDGenerator {
@Test
public void testSequenceIDGenUponRatis() throws Exception {
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
// change batchSize to 100
conf.setInt(OZONE_SCM_SEQUENCE_ID_BATCH_SIZE, 100);
@@ -129,7 +136,7 @@ public class TestSequenceIDGenerator {
public void testSequenceIDGenUponRatisWhenCurrentScmIsNotALeader()
throws Exception {
int batchSize = 100;
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
conf.setInt(OZONE_SCM_SEQUENCE_ID_BATCH_SIZE, batchSize);
SCMMetadataStore scmMetadataStore = new SCMMetadataStoreImpl(conf);
scmMetadataStore.start(conf);
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 9afd9c793c..385e1c6531 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
@@ -18,7 +18,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;
@@ -65,9 +64,8 @@ public class TestPipelineDatanodesIntersection {
@BeforeEach
public void initialize() throws IOException {
- conf = SCMTestUtils.getConf();
+ conf = SCMTestUtils.getConf(testDir);
end = false;
- 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 4852bc4360..e9407d6a94 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.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationConfig;
@@ -128,11 +127,11 @@ public class TestPipelineManagerImpl {
private TestClock testClock;
@BeforeEach
- void init(@TempDir File testDir) throws Exception {
+ void init(@TempDir File testDir, @TempDir File dbDir) throws Exception {
testClock = new TestClock(Instant.now(), ZoneOffset.UTC);
- conf = SCMTestUtils.getConf();
- scm = HddsTestUtils.getScm(conf);
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
+ conf = SCMTestUtils.getConf(dbDir);
+ scm = HddsTestUtils.getScm(SCMTestUtils.getConf(testDir));
+
// Mock Node Manager is not able to correctly set up things for the EC
// placement policy (Rack Scatter), so just use the random one.
conf.set(ScmConfigKeys.OZONE_SCM_CONTAINER_PLACEMENT_EC_IMPL_KEY,
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 da5db2575a..0f9ec84f03 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
@@ -27,7 +27,6 @@ import java.util.UUID;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -108,12 +107,11 @@ public class TestPipelinePlacementPolicy {
// start with nodes with rack awareness.
nodeManager = new MockNodeManager(cluster, getNodesWithRackAwareness(),
false, PIPELINE_PLACEMENT_MAX_NODES_COUNT);
- conf = SCMTestUtils.getConf();
+ conf = SCMTestUtils.getConf(testDir);
conf.setInt(OZONE_DATANODE_PIPELINE_LIMIT, PIPELINE_LOAD_LIMIT);
conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN,
10, StorageUnit.MB);
nodeManager.setNumPipelinePerDatanode(PIPELINE_LOAD_LIMIT);
- 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/TestPipelineStateManagerImpl.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineStateManagerImpl.java
index a29f64f81c..9feb9e1f0a 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
@@ -18,7 +18,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.client.ReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -68,8 +67,7 @@ public class TestPipelineStateManagerImpl {
@BeforeEach
public void init() throws Exception {
- final OzoneConfiguration conf = SCMTestUtils.getConf();
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
+ final OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
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 ceca4ab73e..b69ebedb04 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
@@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm.pipeline;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
@@ -60,8 +59,7 @@ public class TestSimplePipelineProvider {
@BeforeEach
public void init() throws Exception {
nodeManager = new MockNodeManager(true, 10);
- final OzoneConfiguration conf = SCMTestUtils.getConf();
- conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
+ final OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
dbStore = DBStoreBuilder.createDBStore(
conf, new SCMDBDefinition());
SCMHAManager scmhaManager = SCMHAManagerStub.getInstance(true);
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 79be275788..7c06b79a2f 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
@@ -31,6 +31,9 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.junit.jupiter.api.AfterEach;
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 static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_READONLY_ADMINISTRATORS;
@@ -50,8 +53,8 @@ public class TestSCMClientProtocolServer {
private StorageContainerLocationProtocolServerSideTranslatorPB service;
@BeforeEach
- void setUp() throws Exception {
- config = SCMTestUtils.getConf();
+ void setUp(@TempDir File testDir) throws Exception {
+ config = SCMTestUtils.getConf(testDir);
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 46cd784c47..58f65df8fd 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
@@ -100,6 +100,9 @@ public class TestEndPoint {
private static DatanodeLayoutStorage layoutStorage;
private static DatanodeDetails dnDetails;
+ @TempDir
+ private File tempDir;
+
@AfterAll
public static void tearDown() throws Exception {
if (scmServer != null) {
@@ -110,7 +113,7 @@ public class TestEndPoint {
@BeforeAll
static void setUp() throws Exception {
serverAddress = SCMTestUtils.getReuseableAddress();
- ozoneConf = SCMTestUtils.getConf();
+ ozoneConf = SCMTestUtils.getConf(testDir);
scmServerImpl = new ScmTestMock();
dnDetails = randomDatanodeDetails();
layoutStorage = new DatanodeLayoutStorage(ozoneConf,
@@ -128,7 +131,7 @@ public class TestEndPoint {
@Test
public void testGetVersion() throws Exception {
try (EndpointStateMachine rpcEndPoint =
- createEndpoint(SCMTestUtils.getConf(),
+ createEndpoint(SCMTestUtils.getConf(tempDir),
serverAddress, 1000)) {
SCMVersionResponseProto responseProto = rpcEndPoint.getEndPoint()
.getVersion(null);
@@ -316,7 +319,7 @@ public class TestEndPoint {
*/
@Test
public void testGetVersionToInvalidEndpoint() throws Exception {
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(tempDir);
InetSocketAddress nonExistentServerAddress = SCMTestUtils
.getReuseableAddress();
try (EndpointStateMachine rpcEndPoint = createEndpoint(conf,
@@ -344,7 +347,7 @@ public class TestEndPoint {
public void testGetVersionAssertRpcTimeOut() throws Exception {
final long rpcTimeout = 1000;
final long tolerance = 100;
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(tempDir);
try (EndpointStateMachine rpcEndPoint = createEndpoint(conf,
serverAddress, (int) rpcTimeout)) {
@@ -369,7 +372,7 @@ public class TestEndPoint {
public void testRegister() throws Exception {
DatanodeDetails nodeToRegister = randomDatanodeDetails();
try (EndpointStateMachine rpcEndPoint = createEndpoint(
- SCMTestUtils.getConf(), serverAddress, 1000)) {
+ SCMTestUtils.getConf(tempDir), serverAddress, 1000)) {
SCMRegisteredResponseProto responseProto = rpcEndPoint.getEndPoint()
.register(nodeToRegister.getExtendedProtoBufMessage(), HddsTestUtils
.createNodeReport(
@@ -403,7 +406,7 @@ public class TestEndPoint {
private EndpointStateMachine registerTaskHelper(InetSocketAddress scmAddress,
int rpcTimeout, boolean clearDatanodeDetails
) throws Exception {
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(tempDir);
EndpointStateMachine rpcEndPoint =
createEndpoint(conf,
scmAddress, rpcTimeout);
@@ -481,7 +484,7 @@ public class TestEndPoint {
public void testHeartbeat() throws Exception {
DatanodeDetails dataNode = randomDatanodeDetails();
try (EndpointStateMachine rpcEndPoint =
- createEndpoint(SCMTestUtils.getConf(),
+ createEndpoint(SCMTestUtils.getConf(tempDir),
serverAddress, 1000)) {
SCMHeartbeatRequestProto request = SCMHeartbeatRequestProto.newBuilder()
.setDatanodeDetails(dataNode.getProtoBufMessage())
@@ -501,7 +504,7 @@ public class TestEndPoint {
public void testHeartbeatWithCommandStatusReport() throws Exception {
DatanodeDetails dataNode = randomDatanodeDetails();
try (EndpointStateMachine rpcEndPoint =
- createEndpoint(SCMTestUtils.getConf(),
+ createEndpoint(SCMTestUtils.getConf(tempDir),
serverAddress, 1000)) {
// Add some scmCommands for heartbeat response
addScmCommands();
@@ -572,7 +575,7 @@ public class TestEndPoint {
InetSocketAddress scmAddress,
int rpcTimeout
) throws Exception {
- OzoneConfiguration conf = SCMTestUtils.getConf();
+ OzoneConfiguration conf = SCMTestUtils.getConf(tempDir);
// 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-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 57b9e3c54a..74d52c4a94 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
@@ -109,8 +109,8 @@ public class TestMiniOzoneCluster {
}
@Test
- public void testContainerRandomPort() throws IOException {
- OzoneConfiguration ozoneConf = SCMTestUtils.getConf();
+ void testContainerRandomPort(@TempDir File tempDir) throws IOException {
+ OzoneConfiguration ozoneConf = SCMTestUtils.getConf(tempDir);
// Each instance of SM will create an ozone container
// that bounds to a random port.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
