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 e4124e07d8e HDDS-15753. Rename TestClock to MockClock (#10712)
e4124e07d8e is described below
commit e4124e07d8e8a4eb322f0e2bec1d7f6d159f5ae0
Author: Prathmesh Sapate <[email protected]>
AuthorDate: Fri Jul 10 22:31:08 2026 +0530
HDDS-15753. Rename TestClock to MockClock (#10712)
---
.../java/org/apache/hadoop/hdds/utils/SlidingWindow.java | 2 +-
.../hadoop/hdds/scm/container/TestContainerInfo.java | 4 ++--
.../hdds/scm/container/common/helpers/TestExcludeList.java | 4 ++--
.../org/apache/hadoop/hdds/utils/TestSlidingWindow.java | 6 +++---
.../TestStaleRecoveringContainerScrubbingService.java | 6 +++---
.../commandhandler/TestDeleteContainerCommandHandler.java | 14 +++++++-------
.../common/volume/TestStorageVolumeHealthChecks.java | 4 ++--
.../ozone/container/diskbalancer/TestDiskBalancerTask.java | 8 ++++----
.../container/replication/TestReplicationSupervisor.java | 6 +++---
.../hdds/scm/container/balancer/TestMoveManager.java | 6 +++---
.../replication/TestContainerReplicaPendingOps.java | 6 +++---
.../scm/container/replication/TestReplicationManager.java | 6 +++---
.../replication/TestReplicationManagerScenarios.java | 6 +++---
.../container/replication/TestReplicationManagerUtil.java | 4 ++--
.../replication/health/TestClosingContainerHandler.java | 4 ++--
.../hadoop/hdds/scm/ha/TestBackgroundSCMService.java | 6 +++---
.../hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java | 8 ++++----
.../scm/safemode/TestOneReplicaPipelineSafeModeRule.java | 4 ++--
.../apache/ozone/test/{TestClock.java => MockClock.java} | 10 +++++-----
.../hadoop/fs/ozone/AbstractOzoneFileSystemTest.java | 4 ++--
.../hadoop/ozone/recon/tasks/ReconTaskControllerImpl.java | 2 +-
.../ozone/recon/tasks/TestReconTaskControllerImpl.java | 6 +++---
22 files changed, 63 insertions(+), 63 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/SlidingWindow.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/SlidingWindow.java
index 316c88aba57..0054b24f6c5 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/SlidingWindow.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/SlidingWindow.java
@@ -156,7 +156,7 @@ public long getExpiryDurationMillis() {
/**
* A custom monotonic clock implementation to allow overriding the current
time for testing purposes.
* Implementation of Clock that uses System.nanoTime() for real usage.
- * The class {@code org.apache.ozone.test.TestClock} provides a mock clock
which can be used
+ * The class {@code org.apache.ozone.test.MockClock} provides a mock clock
which can be used
* to manipulate the current time in tests.
*/
public static final class MonotonicClock extends Clock {
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerInfo.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerInfo.java
index f38eceb52ad..d7c14fd00c8 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerInfo.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerInfo.java
@@ -34,7 +34,7 @@
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.Test;
/**
@@ -110,7 +110,7 @@ void getProtobufEC() {
@Test
void restoreState() {
- TestClock clock = TestClock.newInstance();
+ MockClock clock = MockClock.newInstance();
ContainerInfo subject = newBuilderForTest()
.setClock(clock)
.build();
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/container/common/helpers/TestExcludeList.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/container/common/helpers/TestExcludeList.java
index 96bb3cc9c09..cf028ee8db2 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/container/common/helpers/TestExcludeList.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/container/common/helpers/TestExcludeList.java
@@ -23,14 +23,14 @@
import java.time.ZoneOffset;
import java.util.UUID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.Test;
/**
* Tests the exclude nodes list behavior at client.
*/
public class TestExcludeList {
- private TestClock clock = new TestClock(Instant.now(), ZoneOffset.UTC);
+ private MockClock clock = new MockClock(Instant.now(), ZoneOffset.UTC);
@Test
public void excludeNodesShouldBeCleanedBasedOnGivenTime() {
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/TestSlidingWindow.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/TestSlidingWindow.java
index 369426bcfd0..ba891e044b7 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/TestSlidingWindow.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/TestSlidingWindow.java
@@ -23,7 +23,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.Duration;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -32,11 +32,11 @@
*/
class TestSlidingWindow {
- private TestClock testClock;
+ private MockClock testClock;
@BeforeEach
void setup() {
- testClock = TestClock.newInstance();
+ testClock = MockClock.newInstance();
}
@Test
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestStaleRecoveringContainerScrubbingService.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestStaleRecoveringContainerScrubbingService.java
index a21813956f5..fe4204b159f 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestStaleRecoveringContainerScrubbingService.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestStaleRecoveringContainerScrubbingService.java
@@ -58,7 +58,7 @@
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils;
import
org.apache.hadoop.ozone.container.keyvalue.statemachine.background.StaleRecoveringContainerScrubbingService;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.io.TempDir;
@@ -77,8 +77,8 @@ public class TestStaleRecoveringContainerScrubbingService {
private int containerIdNum = 0;
private MutableVolumeSet volumeSet;
private RoundRobinVolumeChoosingPolicy volumeChoosingPolicy;
- private final TestClock testClock =
- new TestClock(Instant.now(), ZoneOffset.UTC);
+ private final MockClock testClock =
+ new MockClock(Instant.now(), ZoneOffset.UTC);
private void initVersionInfo(ContainerTestVersionInfo versionInfo)
throws IOException {
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerCommandHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerCommandHandler.java
index e4f35691544..ca970fb882b 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerCommandHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerCommandHandler.java
@@ -42,7 +42,7 @@
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;
import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer;
import org.apache.hadoop.ozone.protocol.commands.DeleteContainerCommand;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -51,14 +51,14 @@
*/
public class TestDeleteContainerCommandHandler {
- private TestClock clock;
+ private MockClock clock;
private OzoneContainer ozoneContainer;
private ContainerController controller;
private StateContext context;
@BeforeEach
public void setup() {
- clock = new TestClock(Instant.now(), ZoneId.systemDefault());
+ clock = new MockClock(Instant.now(), ZoneId.systemDefault());
ozoneContainer = mock(OzoneContainer.class);
controller = mock(ContainerController.class);
when(ozoneContainer.getController()).thenReturn(controller);
@@ -114,7 +114,7 @@ public void testCommandForCurrentTermIsExecuted()
when(context.getTermOfLeaderSCM())
.thenReturn(OptionalLong.of(command.getTerm()));
- TestClock testClock = new TestClock(Instant.now(), ZoneId.systemDefault());
+ MockClock testClock = new MockClock(Instant.now(), ZoneId.systemDefault());
CountDownLatch latch = new CountDownLatch(1);
ThreadFactory threadFactory = new ThreadFactoryBuilder().build();
ThreadPoolWithLockExecutor executor = new ThreadPoolWithLockExecutor(
@@ -181,12 +181,12 @@ public void testQueueSize() throws IOException {
}
private static DeleteContainerCommandHandler createSubject() {
- TestClock clock = new TestClock(Instant.now(), ZoneId.systemDefault());
+ MockClock clock = new MockClock(Instant.now(), ZoneId.systemDefault());
return createSubject(clock, 1000);
}
private static DeleteContainerCommandHandler createSubject(
- TestClock clock, int queueSize) {
+ MockClock clock, int queueSize) {
ThreadFactory threadFactory = new ThreadFactoryBuilder().build();
ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.
newFixedThreadPool(1, threadFactory);
@@ -194,7 +194,7 @@ private static DeleteContainerCommandHandler createSubject(
}
private static DeleteContainerCommandHandler createSubjectWithPoolSize(
- TestClock clock, int queueSize) {
+ MockClock clock, int queueSize) {
return new DeleteContainerCommandHandler(1, clock, queueSize, "");
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeHealthChecks.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeHealthChecks.java
index 675abed1696..467c528a6db 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeHealthChecks.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeHealthChecks.java
@@ -34,7 +34,7 @@
import org.apache.hadoop.hdfs.server.datanode.checker.VolumeCheckResult;
import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeConfiguration;
import org.apache.hadoop.ozone.container.common.utils.DiskCheckUtil;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Named;
import org.junit.jupiter.api.Test;
@@ -52,7 +52,7 @@ public class TestStorageVolumeHealthChecks {
private static final String DATANODE_UUID = UUID.randomUUID().toString();
private static final String CLUSTER_ID = UUID.randomUUID().toString();
private static final OzoneConfiguration CONF = new OzoneConfiguration();
- private static final TestClock TEST_CLOCK = TestClock.newInstance();
+ private static final MockClock TEST_CLOCK = MockClock.newInstance();
@TempDir
private static Path volumePath;
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerTask.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerTask.java
index e15eaa3a293..c858ba18618 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerTask.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerTask.java
@@ -90,7 +90,7 @@
import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.GenericTestUtils.LogCapturer;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.assertj.core.api.Fail;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -121,7 +121,7 @@ public class TestDiskBalancerTask {
private HddsVolume sourceVolume;
private HddsVolume destVolume;
private DiskBalancerServiceTestImpl diskBalancerService;
- private TestClock clock;
+ private MockClock clock;
private static final long CONTAINER_ID = 1L;
private static final long CONTAINER_SIZE = 1024L * 1024L; // 1 MB
@@ -252,7 +252,7 @@ public void setup() throws Exception {
DiskBalancerConfiguration diskBalancerConfiguration =
conf.getObject(DiskBalancerConfiguration.class);
diskBalancerConfiguration.setDiskBalancerShouldRun(true);
conf.setFromObject(diskBalancerConfiguration);
- clock = TestClock.newInstance();
+ clock = MockClock.newInstance();
diskBalancerService = new DiskBalancerServiceTestImpl(ozoneContainer,
100, conf, 1, clock);
diskBalancerService.setReplicaDeletionDelay(0);
@@ -831,7 +831,7 @@ public void
testPendingDeletionDoesNotDropReplicasOnSameMillisecondKey(
assertNotNull(task1);
assertNotNull(task2);
- // Run both moves concurrently; fixed TestClock => same deadline key.
+ // Run both moves concurrently; fixed MockClock => same deadline key.
ExecutorService pool = Executors.newFixedThreadPool(2);
try {
List<Future<BackgroundTaskResult>> futures =
pool.invokeAll(Arrays.asList(
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
index 7e45b956cec..026ac6ac76a 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
@@ -91,7 +91,7 @@
import
org.apache.hadoop.ozone.protocol.commands.ReconstructECContainersCommand;
import org.apache.hadoop.ozone.protocol.commands.ReplicateContainerCommand;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
@@ -126,14 +126,14 @@ public class TestReplicationSupervisor {
private ContainerLayoutVersion layoutVersion;
private StateContext context;
- private TestClock clock;
+ private MockClock clock;
private DatanodeDetails datanode;
private DNContainerOperationClient mockClient;
private ContainerController mockController;
@BeforeEach
public void setUp() throws Exception {
- clock = new TestClock(Instant.now(), ZoneId.systemDefault());
+ clock = new MockClock(Instant.now(), ZoneId.systemDefault());
set = newContainerSet();
DatanodeStateMachine stateMachine = mock(DatanodeStateMachine.class);
context = new StateContext(
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestMoveManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestMoveManager.java
index 7df62246c0e..440baa29f13 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestMoveManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestMoveManager.java
@@ -80,7 +80,7 @@
import org.apache.hadoop.hdds.scm.node.NodeStatus;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
@@ -90,7 +90,7 @@
*/
public class TestMoveManager {
- private TestClock clock;
+ private MockClock clock;
private ReplicationManager replicationManager;
private ContainerManager containerManager;
private MoveManager moveManager;
@@ -104,7 +104,7 @@ public class TestMoveManager {
@BeforeEach
public void setup() throws ContainerNotFoundException,
NodeNotFoundException {
- clock = TestClock.newInstance();
+ clock = MockClock.newInstance();
containerInfo = ReplicationTestUtil.createContainerInfo(
RatisReplicationConfig.getInstance(THREE), 1,
HddsProtos.LifeCycleState.CLOSED);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestContainerReplicaPendingOps.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestContainerReplicaPendingOps.java
index 2130e009dd5..217e752278f 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestContainerReplicaPendingOps.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestContainerReplicaPendingOps.java
@@ -45,7 +45,7 @@
import org.apache.hadoop.ozone.protocol.commands.DeleteContainerCommand;
import org.apache.hadoop.ozone.protocol.commands.ReplicateContainerCommand;
import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -56,7 +56,7 @@
public class TestContainerReplicaPendingOps {
private ContainerReplicaPendingOps pendingOps;
- private TestClock clock;
+ private MockClock clock;
private DatanodeDetails dn1;
private DatanodeDetails dn2;
private DatanodeDetails dn3;
@@ -70,7 +70,7 @@ public class TestContainerReplicaPendingOps {
@BeforeEach
public void setup() {
- clock = new TestClock(Instant.now(), ZoneOffset.UTC);
+ clock = new MockClock(Instant.now(), ZoneOffset.UTC);
deadline = clock.millis() + 10000; // Current time plus 10 seconds
OzoneConfiguration conf = new OzoneConfiguration();
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
index 5ae553ea312..bcb3dea9768 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
@@ -101,7 +101,7 @@
import org.apache.hadoop.ozone.protocol.commands.ReplicateContainerCommand;
import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -125,7 +125,7 @@ public class TestReplicationManager {
private EventPublisher eventPublisher;
private SCMContext scmContext;
private NodeManager nodeManager;
- private TestClock clock;
+ private MockClock clock;
private ContainerReplicaPendingOps containerReplicaPendingOps;
private Map<ContainerID, Set<ContainerReplica>> containerReplicaMap;
@@ -160,7 +160,7 @@ public void setup() throws IOException {
return null;
}).when(nodeManager).addDatanodeCommand(any(), any());
- clock = new TestClock(Instant.now(), ZoneId.systemDefault());
+ clock = new MockClock(Instant.now(), ZoneId.systemDefault());
containerReplicaPendingOps =
new ContainerReplicaPendingOps(clock, null);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
index f5b06f90109..7662ed5ba78 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
@@ -69,7 +69,7 @@
import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.ozone.protocol.commands.ReplicateContainerCommand;
import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
@@ -110,7 +110,7 @@ public class TestReplicationManagerScenarios {
private EventPublisher eventPublisher;
private SCMContext scmContext;
private NodeManager nodeManager;
- private TestClock clock;
+ private MockClock clock;
private static List<URI> getTestFiles() throws URISyntaxException {
File[] fileList = (new File(TestReplicationManagerScenarios.class
@@ -183,7 +183,7 @@ public void setup() throws IOException,
NodeNotFoundException {
return null;
}).when(nodeManager).addDatanodeCommand(any(), any());
- clock = new TestClock(Instant.now(), ZoneId.systemDefault());
+ clock = new MockClock(Instant.now(), ZoneId.systemDefault());
containerReplicaPendingOps = new ContainerReplicaPendingOps(clock, null);
when(containerManager.getContainerReplicas(any(ContainerID.class))).thenAnswer(
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerUtil.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerUtil.java
index fad2cf053f2..e6bec671ff6 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerUtil.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerUtil.java
@@ -53,7 +53,7 @@
import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.scm.node.NodeStatus;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -295,7 +295,7 @@ public void
testDatanodesWithInSufficientDiskSpaceAreExcluded() throws NodeNotFo
// set up mocks such ContainerReplicaPendingOps returns the
containerSizeScheduled map
ReplicationManagerConfiguration rmConf = new
ReplicationManagerConfiguration();
when(replicationManager.getConfig()).thenReturn(rmConf);
- TestClock clock = new TestClock(Instant.now(), ZoneOffset.UTC);
+ MockClock clock = new MockClock(Instant.now(), ZoneOffset.UTC);
ConcurrentHashMap<DatanodeID, SizeAndTime> sizeScheduledMap = new
ConcurrentHashMap<>();
// fullDn has 10GB size scheduled, 30GB available and 20GB min free space,
so it should be excluded
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosingContainerHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosingContainerHandler.java
index dca89171f0e..b80f305c320 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosingContainerHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosingContainerHandler.java
@@ -53,7 +53,7 @@
import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationTestUtil;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -75,7 +75,7 @@ public class TestClosingContainerHandler {
private static final RatisReplicationConfig RATIS_REPLICATION_CONFIG =
RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE);
- private final TestClock clock = TestClock.newInstance();
+ private final MockClock clock = MockClock.newInstance();
@BeforeEach
public void setup() {
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestBackgroundSCMService.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestBackgroundSCMService.java
index 5acb36aadcc..a2d3c38772d 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestBackgroundSCMService.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestBackgroundSCMService.java
@@ -30,7 +30,7 @@
import java.util.concurrent.TimeoutException;
import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
import org.apache.hadoop.hdds.scm.safemode.SCMSafeModeManager.SafeModeStatus;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -40,13 +40,13 @@
* */
public class TestBackgroundSCMService {
private BackgroundSCMService backgroundSCMService;
- private TestClock testClock;
+ private MockClock testClock;
private SCMContext scmContext;
private PipelineManager pipelineManager;
@BeforeEach
public void setup() throws IOException, TimeoutException {
- testClock = new TestClock(Instant.now(), ZoneOffset.UTC);
+ testClock = new MockClock(Instant.now(), ZoneOffset.UTC);
scmContext = SCMContext.emptyContext();
this.pipelineManager = mock(PipelineManager.class);
doNothing().when(pipelineManager).scrubPipelines();
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 7a9e5b4e819..2f1d5ede5d7 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
@@ -103,7 +103,7 @@
import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.GenericTestUtils.LogCapturer;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.apache.ratis.util.function.CheckedRunnable;
import org.assertj.core.util.Lists;
@@ -124,11 +124,11 @@ public class TestPipelineManagerImpl {
private SCMContext scmContext;
private SCMServiceManager serviceManager;
private StorageContainerManager scm;
- private TestClock testClock;
+ private MockClock testClock;
@BeforeEach
void init(@TempDir File testDir, @TempDir File dbDir) throws Exception {
- testClock = new TestClock(Instant.now(), ZoneOffset.UTC);
+ testClock = new MockClock(Instant.now(), ZoneOffset.UTC);
conf = SCMTestUtils.getConf(dbDir);
scm = HddsTestUtils.getScm(SCMTestUtils.getConf(testDir));
@@ -179,7 +179,7 @@ private PipelineManagerImpl createPipelineManager(
new EventQueue(),
SCMContext.emptyContext(),
serviceManager,
- new TestClock(Instant.now(), ZoneOffset.UTC));
+ new MockClock(Instant.now(), ZoneOffset.UTC));
}
@Test
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
index 801b5351324..ab1418a8bf0 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
@@ -58,7 +58,7 @@
import org.apache.hadoop.hdds.server.events.EventQueue;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.GenericTestUtils.LogCapturer;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
@@ -103,7 +103,7 @@ private void setup(int nodes, int pipelineFactorThreeCount,
eventQueue,
scmContext,
serviceManager,
- new TestClock(Instant.now(), ZoneOffset.UTC));
+ new MockClock(Instant.now(), ZoneOffset.UTC));
PipelineProvider<RatisReplicationConfig> mockRatisProvider =
new MockRatisPipelineProvider(mockNodeManager,
diff --git
a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/TestClock.java
b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/MockClock.java
similarity index 88%
rename from
hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/TestClock.java
rename to
hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/MockClock.java
index 565b092ed5b..bfb5e81d497 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/TestClock.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/MockClock.java
@@ -28,16 +28,16 @@
* moved forward and back. Intended for use only in tests.
*/
-public class TestClock extends Clock {
+public class MockClock extends Clock {
private Instant instant;
private final ZoneId zoneId;
- public static TestClock newInstance() {
- return new TestClock(Instant.now(), ZoneOffset.UTC);
+ public static MockClock newInstance() {
+ return new MockClock(Instant.now(), ZoneOffset.UTC);
}
- public TestClock(Instant instant, ZoneId zone) {
+ public MockClock(Instant instant, ZoneId zone) {
this.instant = instant;
this.zoneId = zone;
}
@@ -49,7 +49,7 @@ public ZoneId getZone() {
@Override
public Clock withZone(ZoneId zone) {
- return new TestClock(Instant.now(), zone);
+ return new MockClock(Instant.now(), zone);
}
@Override
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
index efc79b7e08c..32d97295917 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
@@ -115,7 +115,7 @@
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.Time;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -1203,7 +1203,7 @@ public void
testCreateKeyShouldUseRefreshedBucketReplicationConfig()
throws IOException {
OzoneBucket bucket =
TestDataUtil.createVolumeAndBucket(client, bucketLayout);
- final TestClock testClock = new TestClock(Instant.now(), ZoneOffset.UTC);
+ final MockClock testClock = new MockClock(Instant.now(), ZoneOffset.UTC);
String rootPath = String
.format("%s://%s.%s/", OzoneConsts.OZONE_URI_SCHEME, bucket.getName(),
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconTaskControllerImpl.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconTaskControllerImpl.java
index 23b6e37136c..223d7583d04 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconTaskControllerImpl.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconTaskControllerImpl.java
@@ -104,7 +104,7 @@ public class ReconTaskControllerImpl implements
ReconTaskController {
private static final int MAX_EVENT_PROCESS_RETRIES = 6;
private static final long RETRY_DELAY_MS = 2000; // 2 seconds
// Clock for the retry-delay gate; overridable in tests via the
- // @VisibleForTesting constructor to drive the gate with a TestClock.
+ // @VisibleForTesting constructor to drive the gate with a MockClock.
private Clock clock = Clock.systemUTC();
@Inject
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java
index 26e47f8f6c1..5fefd4ee8d2 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java
@@ -58,7 +58,7 @@
import org.apache.ozone.recon.schema.generated.tables.daos.ReconTaskStatusDao;
import org.apache.ozone.recon.schema.generated.tables.pojos.ReconTaskStatus;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.TestClock;
+import org.apache.ozone.test.MockClock;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -70,7 +70,7 @@ public class TestReconTaskControllerImpl extends
AbstractReconSqlDBTest {
private ReconTaskController reconTaskController;
private ReconTaskStatusDao reconTaskStatusDao;
- private TestClock testClock;
+ private MockClock testClock;
public TestReconTaskControllerImpl() {
super();
@@ -93,7 +93,7 @@ public void setUp() throws IOException {
ReconNamespaceSummaryManager nsSummaryManager =
mock(ReconNamespaceSummaryManager.class);
ReconGlobalStatsManager reconGlobalStatsManager =
mock(ReconGlobalStatsManager.class);
ReconFileMetadataManager reconFileMetadataManager =
mock(ReconFileMetadataManager.class);
- testClock = TestClock.newInstance();
+ testClock = MockClock.newInstance();
reconTaskController = new ReconTaskControllerImpl(ozoneConfiguration, new
HashSet<>(),
reconTaskStatusUpdaterManagerMock, reconDbProvider, reconContainerMgr,
nsSummaryManager,
reconGlobalStatsManager, reconFileMetadataManager, testClock);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
