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 fc30abeea0 HDDS-8712. Clean up replication code (#4787)
fc30abeea0 is described below
commit fc30abeea098ef3100ae61224ddbf33e143c647a
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jun 1 14:20:24 2023 +0200
HDDS-8712. Clean up replication code (#4787)
---
.../replication/AbstractOverReplicationHandler.java | 3 ---
.../scm/container/replication/ContainerReplicaOp.java | 8 ++++----
.../container/replication/ContainerReplicaPendingOps.java | 8 ++------
.../replication/DatanodeCommandCountUpdatedHandler.java | 2 +-
.../container/replication/ECContainerReplicaCount.java | 5 +----
.../container/replication/RatisContainerReplicaCount.java | 7 +++----
.../scm/container/replication/ReplicationManager.java | 11 +----------
.../container/replication/ReplicationManagerMetrics.java | 2 +-
.../scm/container/replication/ReplicationManagerUtil.java | 4 ++--
.../replication/health/DeletingContainerHandler.java | 2 +-
.../replication/health/ECReplicationCheckHandler.java | 2 +-
.../replication/health/MismatchedReplicasHandler.java | 2 +-
.../replication/health/RatisReplicationCheckHandler.java | 2 +-
.../scm/container/replication/health/package-info.java | 7 +++----
.../hdds/scm/container/replication/package-info.java | 7 +++----
.../hadoop/hdds/scm/server/StorageContainerManager.java | 2 +-
.../apache/hadoop/hdds/scm/block/TestBlockManager.java | 2 +-
.../hdds/scm/container/TestContainerReportHandler.java | 2 +-
.../hdds/scm/container/TestContainerStateManager.java | 2 +-
.../container/TestIncrementalContainerReportHandler.java | 2 +-
.../scm/container/replication/ReplicationTestUtil.java | 7 -------
.../replication/TestContainerReplicaPendingOps.java | 15 +++++----------
.../replication/TestECOverReplicationHandler.java | 11 ++++-------
.../replication/TestLegacyReplicationManager.java | 10 ++++------
.../container/replication/TestMisReplicationHandler.java | 3 ++-
.../replication/TestOverReplicatedProcessor.java | 3 +--
.../scm/container/replication/TestReplicationManager.java | 2 +-
.../replication/TestReplicationManagerMetrics.java | 4 ++--
.../replication/TestUnderReplicatedProcessor.java | 3 +--
.../replication/health/TestClosingContainerHandler.java | 8 ++++----
.../replication/health/TestDeletingContainerHandler.java | 6 +++---
.../replication/health/TestMismatchedReplicasHandler.java | 12 ++++++------
.../replication/health/TestOpenContainerHandler.java | 12 ++++++------
.../health/TestQuasiClosedContainerHandler.java | 12 ++++++------
.../hdds/scm/container/replication/package-info.java | 3 +--
.../hadoop/hdds/scm/node/TestContainerPlacement.java | 2 +-
.../recon/scm/ReconStorageContainerManagerFacade.java | 2 +-
.../recon/scm/AbstractReconContainerManagerTest.java | 2 +-
38 files changed, 79 insertions(+), 120 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/AbstractOverReplicationHandler.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/AbstractOverReplicationHandler.java
index 9dead0feab..dfea743ded 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/AbstractOverReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/AbstractOverReplicationHandler.java
@@ -64,9 +64,6 @@ public abstract class AbstractOverReplicationHandler
* Allow the placement policy to indicate which replicas can be removed for
* an over replicated container, so that the placement policy is not violated
* by removing them.
- * @param replicas
- * @param expectedCountPerUniqueReplica
- * @return
*/
protected Set<ContainerReplica> selectReplicasToRemove(
Set<ContainerReplica> replicas, int expectedCountPerUniqueReplica) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaOp.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaOp.java
index 88b4b8f869..34cc01eb89 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaOp.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaOp.java
@@ -31,10 +31,10 @@ public class ContainerReplicaOp {
ADD, DELETE
}
- private PendingOpType opType;
- private DatanodeDetails target;
- private int replicaIndex;
- private long deadlineEpochMillis;
+ private final PendingOpType opType;
+ private final DatanodeDetails target;
+ private final int replicaIndex;
+ private final long deadlineEpochMillis;
public static ContainerReplicaOp create(PendingOpType opType,
DatanodeDetails target, int replicaIndex) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java
index fbdde28529..1293aae53a 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm.container.replication;
import com.google.common.util.concurrent.Striped;
-import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.container.ContainerID;
@@ -45,7 +44,6 @@ import static
org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaO
*/
public class ContainerReplicaPendingOps {
- private final ConfigurationSource config;
private final Clock clock;
private final ConcurrentHashMap<ContainerID, List<ContainerReplicaOp>>
pendingOps = new ConcurrentHashMap<>();
@@ -55,12 +53,10 @@ public class ContainerReplicaPendingOps {
private final ConcurrentHashMap<PendingOpType, AtomicLong>
pendingOpCount = new ConcurrentHashMap<>();
private ReplicationManagerMetrics replicationMetrics = null;
- private List<ContainerReplicaPendingOpsSubscriber> subscribers =
+ private final List<ContainerReplicaPendingOpsSubscriber> subscribers =
new ArrayList<>();
- public ContainerReplicaPendingOps(final ConfigurationSource conf,
- Clock clock) {
- this.config = conf;
+ public ContainerReplicaPendingOps(Clock clock) {
this.clock = clock;
resetCounters();
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/DatanodeCommandCountUpdatedHandler.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/DatanodeCommandCountUpdatedHandler.java
index 4cddaaff3d..b106f34cdb 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/DatanodeCommandCountUpdatedHandler.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/DatanodeCommandCountUpdatedHandler.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
public class DatanodeCommandCountUpdatedHandler implements
EventHandler<DatanodeDetails> {
- private ReplicationManager replicationManager;
+ private final ReplicationManager replicationManager;
private static final Logger LOG =
LoggerFactory.getLogger(DatanodeCommandCountUpdatedHandler.class);
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ECContainerReplicaCount.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ECContainerReplicaCount.java
index b7468cdf57..0e7841083a 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ECContainerReplicaCount.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ECContainerReplicaCount.java
@@ -175,7 +175,6 @@ public class ECContainerReplicaCount implements
ContainerReplicaCount {
/**
* Given a ContainerReplicaOp, check its index is within the expected
* bounds and then add it to the relevant list.
- * @param op
*/
private void processPendingOp(ContainerReplicaOp op) {
ensureIndexWithinBounds(op.getReplicaIndex(), "pending" + op.getOpType());
@@ -363,7 +362,6 @@ public class ECContainerReplicaCount implements
ContainerReplicaCount {
* remainingMaintenanceRedundancy of 1, and two replicas in maintenance,
* this will return 1, indicating one of the maintenance replicas must be
* copied to an in-service node to meet the redundancy guarantee.
- * @return
*/
public int additionalMaintenanceCopiesNeeded(boolean includePendingAdd) {
Set<Integer> maintenanceOnly = maintenanceOnlyIndexes(includePendingAdd);
@@ -567,7 +565,6 @@ public class ECContainerReplicaCount implements
ContainerReplicaCount {
/**
* Returns the maximum number of replicas that are allowed to be only on a
* maintenance node, with no other copies on in-service nodes.
- * @return
*/
private int getMaxMaintenance() {
return Math.max(0, repConfig.getParity() - remainingMaintenanceRedundancy);
@@ -577,7 +574,7 @@ public class ECContainerReplicaCount implements
ContainerReplicaCount {
* Validate to ensure that the replia index is between 1 and the max expected
* replica index for the replication config, eg 5 for 3-2, 9 for 6-3 etc.
* @param index The replica index to check.
- * @Throws IllegalArgumentException if the index is out of bounds.
+ * @throws IllegalArgumentException if the index is out of bounds.
*/
private void ensureIndexWithinBounds(Integer index, String setName) {
if (index < 1 || index > repConfig.getRequiredNodes()) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java
index a6e6e390e9..47b0da9be6 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java
@@ -359,7 +359,8 @@ public class RatisContainerReplicaCount implements
ContainerReplicaCount {
* for under replicated and a negative value for over replicated.
*/
private int missingReplicas() {
- int delta = repFactor - getAvailableReplicas();
+ int availableReplicas = getAvailableReplicas();
+ int delta = repFactor - availableReplicas;
if (delta < 0) {
// Over replicated, so may need to remove a container.
@@ -368,7 +369,7 @@ public class RatisContainerReplicaCount implements
ContainerReplicaCount {
// May be under-replicated, depending on maintenance.
delta = Math.max(0, delta - getMaintenanceCount());
int neededHealthy =
- Math.max(0, minHealthyForMaintenance - getAvailableReplicas());
+ Math.max(0, minHealthyForMaintenance - availableReplicas);
delta = Math.max(neededHealthy, delta);
return delta;
} else { // delta == 0
@@ -486,8 +487,6 @@ public class RatisContainerReplicaCount implements
ContainerReplicaCount {
/**
* Return the delta from the expected number of replicas, optionally
* considering inflight add and deletes.
- * @param includePendingDelete
- * @param includePendingAdd
* @return zero if perfectly replicated, a negative value for over
replication
* and a positive value for under replication. The magnitude of the
* return value indicates how many replias the container is over or
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
index 1053b669d9..a29e880660 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
@@ -155,7 +155,7 @@ public class ReplicationManager implements SCMService {
* Legacy RM will hopefully be removed after completing refactor
* for now, it is used to process non-EC container.
*/
- private LegacyReplicationManager legacyReplicationManager;
+ private final LegacyReplicationManager legacyReplicationManager;
/**
* Set of nodes which have been excluded for replication commands due to the
@@ -214,7 +214,6 @@ public class ReplicationManager implements SCMService {
* @param clock Clock object used to get the current time
* @param legacyReplicationManager The legacy ReplicationManager instance
* @param replicaPendingOps The pendingOps instance
- * @throws IOException
*/
@SuppressWarnings("parameternumber")
public ReplicationManager(final ConfigurationSource conf,
@@ -526,9 +525,6 @@ public class ReplicationManager implements SCMService {
* @param sources The list of datanodes that can be used as sources
* @param target The target datanode where the container should be replicated
* @param replicaIndex The index of the container replica to be replicated
- * @return A pair containing the datanode that the command was sent to, and
- * the command created.
- * @throws CommandTargetOverloadedException
*/
public void sendThrottledReplicationCommand(ContainerInfo containerInfo,
List<DatanodeDetails> sources, DatanodeDetails target, int replicaIndex)
@@ -638,7 +634,6 @@ public class ReplicationManager implements SCMService {
* @param target The target to push container replica to
* @param scmDeadlineEpochMs The epoch time in ms, after which the command
* will be discarded from the SCMPendingOps table.
- * @throws NotLeaderException
*/
public void sendLowPriorityReplicateContainerCommand(
final ContainerInfo container, int replicaIndex, DatanodeDetails source,
@@ -656,7 +651,6 @@ public class ReplicationManager implements SCMService {
* @param command The command to send.
* @param containerInfo The container the command is for.
* @param target The datanode which will receive the command.
- * @throws NotLeaderException
*/
public void sendDatanodeCommand(SCMCommand<?> command,
ContainerInfo containerInfo, DatanodeDetails target)
@@ -673,7 +667,6 @@ public class ReplicationManager implements SCMService {
* @param target The datanode which will receive the command.
* @param scmDeadlineEpochMs The epoch time in ms, after which the command
* will be discarded from the SCMPendingOps table.
- * @throws NotLeaderException
*/
public void sendDatanodeCommand(SCMCommand<?> command,
ContainerInfo containerInfo, DatanodeDetails target,
@@ -956,7 +949,6 @@ public class ReplicationManager implements SCMService {
* ContainerReplicaCount object for the container.
* @param containerID The ID of the container
* @return ContainerReplicaCount for the given container
- * @throws ContainerNotFoundException
*/
public ContainerReplicaCount getContainerReplicaCount(ContainerID
containerID)
throws ContainerNotFoundException {
@@ -977,7 +969,6 @@ public class ReplicationManager implements SCMService {
* replication health and return the health status.
* @param containerInfo The container to check
* @param replicas The set of replicas to use to check for the check
- * @return
*/
public ContainerHealthResult getContainerReplicationHealth(
ContainerInfo containerInfo, Set<ContainerReplica> replicas) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerMetrics.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerMetrics.java
index e4f4e10053..40922c84af 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerMetrics.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerMetrics.java
@@ -147,7 +147,7 @@ public final class ReplicationManagerMetrics implements
MetricsSource {
private MetricsRegistry registry;
- private ReplicationManager replicationManager;
+ private final ReplicationManager replicationManager;
//EC Metrics
@Metric("Number of EC Replication commands sent.")
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerUtil.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerUtil.java
index 6757b059da..5f43ee2058 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerUtil.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerUtil.java
@@ -170,8 +170,8 @@ public final class ReplicationManagerUtil {
* Simple class to hold the excluded and used nodes lists.
*/
public static class ExcludedAndUsedNodes {
- private List<DatanodeDetails> excludedNodes;
- private List<DatanodeDetails> usedNodes;
+ private final List<DatanodeDetails> excludedNodes;
+ private final List<DatanodeDetails> usedNodes;
public ExcludedAndUsedNodes(List<DatanodeDetails> excludedNodes,
List<DatanodeDetails> usedNodes) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/DeletingContainerHandler.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/DeletingContainerHandler.java
index 7612987fa0..d4b8b262b5 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/DeletingContainerHandler.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/DeletingContainerHandler.java
@@ -80,7 +80,7 @@ public class DeletingContainerHandler extends AbstractCheck {
Set<DatanodeDetails> pendingDelete = request.getPendingOps().stream()
.filter(o -> o.getOpType() == ContainerReplicaOp.PendingOpType.DELETE)
- .map(o -> o.getTarget()).collect(Collectors.toSet());
+ .map(ContainerReplicaOp::getTarget).collect(Collectors.toSet());
//resend deleteCommand if needed
request.getContainerReplicas().stream()
.filter(r -> !pendingDelete.contains(r.getDatanodeDetails()))
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/ECReplicationCheckHandler.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/ECReplicationCheckHandler.java
index 55f6c4cdf4..cd85f74018 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/ECReplicationCheckHandler.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/ECReplicationCheckHandler.java
@@ -188,7 +188,7 @@ public class ECReplicationCheckHandler extends
AbstractCheck {
* Given a set of ContainerReplica, transform it to a list of DatanodeDetails
* and then check if the list meets the container placement policy.
* @param replicas List of containerReplica
- * @param replicationFactor Expected Replication Factor of the containe
+ * @param replicationFactor Expected Replication Factor of the container
* @return ContainerPlacementStatus indicating if the policy is met or not
*/
private ContainerPlacementStatus getPlacementStatus(
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/MismatchedReplicasHandler.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/MismatchedReplicasHandler.java
index 86c9db0df2..ecfdf0c90e 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/MismatchedReplicasHandler.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/MismatchedReplicasHandler.java
@@ -38,7 +38,7 @@ public class MismatchedReplicasHandler extends AbstractCheck {
public static final Logger LOG =
LoggerFactory.getLogger(MismatchedReplicasHandler.class);
- private ReplicationManager replicationManager;
+ private final ReplicationManager replicationManager;
public MismatchedReplicasHandler(
ReplicationManager replicationManager) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/RatisReplicationCheckHandler.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/RatisReplicationCheckHandler.java
index 5ee2fb3d86..a1d54ad1fc 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/RatisReplicationCheckHandler.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/RatisReplicationCheckHandler.java
@@ -230,7 +230,7 @@ public class RatisReplicationCheckHandler extends
AbstractCheck {
* Given a set of ContainerReplica, transform it to a list of DatanodeDetails
* and then check if the list meets the container placement policy.
* @param replicas List of containerReplica
- * @param replicationFactor Expected Replication Factor of the containe
+ * @param replicationFactor Expected Replication Factor of the container
* @return ContainerPlacementStatus indicating if the policy is met or not
*/
private ContainerPlacementStatus getPlacementStatus(
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/package-info.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/package-info.java
index cf8396dc42..3127984b37 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/package-info.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.hdds.scm.container.replication.health;
-
/**
- * HDDS Container replicaton check classes.
+ * HDDS Container replication check classes.
*/
+package org.apache.hadoop.hdds.scm.container.replication.health;
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/package-info.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/package-info.java
index a640f3ed60..86624313ab 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/package-info.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.hdds.scm.container.replication;
-
/**
- * HDDS (Closed) Container replicaton related classes.
+ * HDDS (Closed) Container replication related classes.
*/
+package org.apache.hadoop.hdds.scm.container.replication;
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 6a255c7cf9..2d74dfab83 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -716,7 +716,7 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
scmContext);
containerReplicaPendingOps =
- new ContainerReplicaPendingOps(conf, systemClock);
+ new ContainerReplicaPendingOps(systemClock);
long containerReplicaOpScrubberIntervalMs = conf.getTimeDuration(
ScmConfigKeys
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 26ad6ef138..15b5e1f737 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
@@ -157,7 +157,7 @@ public class TestBlockManager {
sequenceIdGen,
pipelineManager,
scmMetadataStore.getContainerTable(),
- new ContainerReplicaPendingOps(conf,
+ new ContainerReplicaPendingOps(
Clock.system(ZoneId.systemDefault())));
SCMSafeModeManager safeModeManager = new SCMSafeModeManager(conf,
containerManager.getContainers(), containerManager,
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 5089c0aa8d..9fef229c7f 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
@@ -113,7 +113,7 @@ public class TestContainerReportHandler {
.setContainerStore(SCMDBDefinition.CONTAINERS.getTable(dbStore))
.setSCMDBTransactionBuffer(scmhaManager.getDBTransactionBuffer())
.setContainerReplicaPendingOps(new ContainerReplicaPendingOps(
- conf, Clock.system(ZoneId.systemDefault())))
+ Clock.system(ZoneId.systemDefault())))
.build();
publisher = Mockito.mock(EventPublisher.class);
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 8697a974dc..0fbba14606 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
@@ -96,7 +96,7 @@ public class TestContainerStateManager {
.setContainerStore(SCMDBDefinition.CONTAINERS.getTable(dbStore))
.setSCMDBTransactionBuffer(scmhaManager.getDBTransactionBuffer())
.setContainerReplicaPendingOps(new ContainerReplicaPendingOps(
- conf, Clock.system(ZoneId.systemDefault())))
+ Clock.system(ZoneId.systemDefault())))
.build();
}
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 42a2701021..599eb73842 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
@@ -141,7 +141,7 @@ public class TestIncrementalContainerReportHandler {
.setContainerStore(SCMDBDefinition.CONTAINERS.getTable(dbStore))
.setSCMDBTransactionBuffer(scmhaManager.getDBTransactionBuffer())
.setContainerReplicaPendingOps(new ContainerReplicaPendingOps(
- conf, Clock.system(ZoneId.systemDefault())))
+ Clock.system(ZoneId.systemDefault())))
.build();
this.publisher = Mockito.mock(EventPublisher.class);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationTestUtil.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationTestUtil.java
index 5da2c8e54b..a0a6fe6f7c 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationTestUtil.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationTestUtil.java
@@ -360,8 +360,6 @@ public final class ReplicationTestUtil {
* @param throwOverloaded If the atomic boolean is true, throw a
* CommandTargetOverloadedException and set the
boolean
* to false, instead of creating the replicate
command.
- * @throws NotLeaderException
- * @throws CommandTargetOverloadedException
*/
public static void mockRMSendThrottleReplicateCommand(ReplicationManager
mock,
Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent,
@@ -394,8 +392,6 @@ public final class ReplicationTestUtil {
* @param throwOverloaded If the atomic boolean is true, throw a
* CommandTargetOverloadedException and set the
boolean
* to false, instead of creating the replicate
command.
- * @throws NotLeaderException
- * @throws CommandTargetOverloadedException
*/
public static void mockSendThrottledReconstructionCommand(
ReplicationManager mock,
@@ -420,7 +416,6 @@ public final class ReplicationTestUtil {
* commandsSent set.
* @param mock Mock of ReplicationManager
* @param commandsSent Set to add the command to rather than sending it.
- * @throws NotLeaderException
*/
public static void mockRMSendDatanodeCommand(ReplicationManager mock,
Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent)
@@ -439,7 +434,6 @@ public final class ReplicationTestUtil {
* commandsSent set.
* @param mock Mock of ReplicationManager
* @param commandsSent Set to add the command to rather than sending it.
- * @throws NotLeaderException
*/
public static void mockRMSendDeleteCommand(ReplicationManager mock,
Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent)
@@ -463,7 +457,6 @@ public final class ReplicationTestUtil {
* the commandsSent set.
* @param mock Mock of ReplicationManager
* @param commandsSent Set to add the command to rather than sending it.
- * @throws NotLeaderException
*/
public static void mockRMSendThrottledDeleteCommand(ReplicationManager mock,
Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent)
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 ed94680f54..0ca05a1e94 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
@@ -17,8 +17,6 @@
*/
package org.apache.hadoop.hdds.scm.container.replication;
-import org.apache.hadoop.hdds.conf.ConfigurationSource;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
import org.apache.hadoop.hdds.scm.container.ContainerID;
@@ -43,21 +41,18 @@ public class TestContainerReplicaPendingOps {
private ContainerReplicaPendingOps pendingOps;
private TestClock clock;
- private ConfigurationSource config;
private DatanodeDetails dn1;
private DatanodeDetails dn2;
private DatanodeDetails dn3;
- private ReplicationManager rm;
private ReplicationManagerMetrics metrics;
private long deadline;
@BeforeEach
public void setup() {
- config = new OzoneConfiguration();
clock = new TestClock(Instant.now(), ZoneOffset.UTC);
deadline = clock.millis() + 10000; // Current time plus 10 seconds
- pendingOps = new ContainerReplicaPendingOps(config, clock);
- rm = Mockito.mock(ReplicationManager.class);
+ pendingOps = new ContainerReplicaPendingOps(clock);
+ ReplicationManager rm = Mockito.mock(ReplicationManager.class);
metrics = ReplicationManagerMetrics.create(rm);
pendingOps.setReplicationMetrics(metrics);
dn1 = MockDatanodeDetails.randomDatanodeDetails();
@@ -110,7 +105,7 @@ public class TestContainerReplicaPendingOps {
Assertions.assertEquals(ADD, op.getOpType());
}
List<DatanodeDetails> allDns = ops.stream()
- .map(s -> s.getTarget()).collect(Collectors.toList());
+ .map(ContainerReplicaOp::getTarget).collect(Collectors.toList());
Assertions.assertTrue(allDns.contains(dn1));
Assertions.assertTrue(allDns.contains(dn2));
Assertions.assertTrue(allDns.contains(dn3));
@@ -137,7 +132,7 @@ public class TestContainerReplicaPendingOps {
Assertions.assertEquals(DELETE, op.getOpType());
}
List<DatanodeDetails> allDns = ops.stream()
- .map(s -> s.getTarget()).collect(Collectors.toList());
+ .map(ContainerReplicaOp::getTarget).collect(Collectors.toList());
Assertions.assertTrue(allDns.contains(dn1));
Assertions.assertTrue(allDns.contains(dn2));
Assertions.assertTrue(allDns.contains(dn3));
@@ -234,7 +229,7 @@ public class TestContainerReplicaPendingOps {
Assertions.assertEquals(2, ops.size());
// We should lose the entries for DN1
List<DatanodeDetails> dns = ops.stream()
- .map(s -> s.getTarget())
+ .map(ContainerReplicaOp::getTarget)
.collect(Collectors.toList());
Assertions.assertFalse(dns.contains(dn1));
Assertions.assertTrue(dns.contains(dn2));
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 b69a1fbc43..a9d18b2466 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
@@ -72,11 +72,8 @@ import static org.mockito.Mockito.doAnswer;
* Tests the ECOverReplicationHandling functionality.
*/
public class TestECOverReplicationHandler {
- private ECReplicationConfig repConfig;
private ContainerInfo container;
- private NodeManager nodeManager;
private ReplicationManager replicationManager;
- private OzoneConfiguration conf;
private PlacementPolicy policy;
private DatanodeDetails staleNode;
private Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent;
@@ -102,9 +99,9 @@ public class TestECOverReplicationHandler {
ReplicationTestUtil.mockRMSendThrottledDeleteCommand(replicationManager,
commandsSent);
- nodeManager = new MockNodeManager(true, 10);
- conf = SCMTestUtils.getConf();
- repConfig = new ECReplicationConfig(3, 2);
+ NodeManager nodeManager = new MockNodeManager(true, 10);
+ OzoneConfiguration conf = SCMTestUtils.getConf();
+ ECReplicationConfig repConfig = new ECReplicationConfig(3, 2);
container = ReplicationTestUtil
.createContainer(HddsProtos.LifeCycleState.CLOSED, repConfig);
policy = ReplicationTestUtil
@@ -136,7 +133,7 @@ public class TestECOverReplicationHandler {
container.containerID(), 5, IN_SERVICE,
ContainerReplicaProto.State.CLOSED);
availableReplicas.add(excess);
- List<ContainerReplicaOp> pendingOps = new ArrayList();
+ List<ContainerReplicaOp> pendingOps = new ArrayList<>();
pendingOps.add(ContainerReplicaOp.create(DELETE,
excess.getDatanodeDetails(), 5));
testOverReplicationWithIndexes(availableReplicas, Collections.emptyMap(),
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 324c674f73..379169a56b 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
@@ -135,8 +135,6 @@ public class TestLegacyReplicationManager {
private TestClock clock;
private File testDir;
private DBStore dbStore;
- private PipelineManager pipelineManager;
- private SCMHAManager scmhaManager;
private ContainerReplicaPendingOps containerReplicaPendingOps;
int getInflightCount(InflightType type) {
@@ -158,13 +156,13 @@ public class TestLegacyReplicationManager {
containerManager = Mockito.mock(ContainerManager.class);
nodeManager = new SimpleMockNodeManager();
eventQueue = new EventQueue();
- scmhaManager = SCMHAManagerStub.getInstance(true);
+ 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 = Mockito.mock(PipelineManager.class);
+ PipelineManager pipelineManager = Mockito.mock(PipelineManager.class);
when(pipelineManager.containsPipeline(Mockito.any(PipelineID.class)))
.thenReturn(true);
containerStateManager = ContainerStateManagerImpl.newBuilder()
@@ -174,7 +172,7 @@ public class TestLegacyReplicationManager {
.setContainerStore(SCMDBDefinition.CONTAINERS.getTable(dbStore))
.setSCMDBTransactionBuffer(scmhaManager.getDBTransactionBuffer())
.setContainerReplicaPendingOps(new ContainerReplicaPendingOps(
- conf, Clock.system(ZoneId.systemDefault())))
+ Clock.system(ZoneId.systemDefault())))
.build();
serviceManager = new SCMServiceManager();
@@ -222,7 +220,7 @@ public class TestLegacyReplicationManager {
)).thenAnswer(invocation ->
new ContainerPlacementStatusDefault(2, 2, 3));
clock = new TestClock(Instant.now(), ZoneId.of("UTC"));
- containerReplicaPendingOps = new ContainerReplicaPendingOps(conf, clock);
+ containerReplicaPendingOps = new ContainerReplicaPendingOps(clock);
createReplicationManager(newRMConfig());
}
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 b857da0a7a..eb5f068e46 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
@@ -70,7 +70,8 @@ public abstract class TestMisReplicationHandler {
private OzoneConfiguration conf;
private ReplicationManager replicationManager;
private Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent;
- private AtomicBoolean throwThrottledException = new AtomicBoolean(false);
+ private final AtomicBoolean throwThrottledException =
+ new AtomicBoolean(false);
protected void setup(ReplicationConfig repConfig)
throws NodeNotFoundException, CommandTargetOverloadedException,
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestOverReplicatedProcessor.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestOverReplicatedProcessor.java
index 6a5b3fcfea..65d517fbb3 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestOverReplicatedProcessor.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestOverReplicatedProcessor.java
@@ -39,7 +39,6 @@ import static org.mockito.ArgumentMatchers.any;
*/
public class TestOverReplicatedProcessor {
- private ConfigurationSource conf;
private ReplicationManager replicationManager;
private ECReplicationConfig repConfig;
private OverReplicatedProcessor overReplicatedProcessor;
@@ -47,7 +46,7 @@ public class TestOverReplicatedProcessor {
@Before
public void setup() {
- conf = new OzoneConfiguration();
+ ConfigurationSource conf = new OzoneConfiguration();
ReplicationManagerConfiguration rmConf =
conf.getObject(ReplicationManagerConfiguration.class);
replicationManager = Mockito.mock(ReplicationManager.class);
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 c05c13d773..e3311edfe7 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
@@ -139,7 +139,7 @@ public class TestReplicationManager {
legacyReplicationManager = Mockito.mock(LegacyReplicationManager.class);
clock = new TestClock(Instant.now(), ZoneId.systemDefault());
containerReplicaPendingOps =
- new ContainerReplicaPendingOps(configuration, clock);
+ new ContainerReplicaPendingOps(clock);
Mockito.when(containerManager
.getContainerReplicas(Mockito.any(ContainerID.class))).thenAnswer(
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerMetrics.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerMetrics.java
index b75e2e0011..b226ea0097 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerMetrics.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerMetrics.java
@@ -33,7 +33,6 @@ import static
org.apache.hadoop.test.MetricsAsserts.getMetrics;
*/
public class TestReplicationManagerMetrics {
- private ReplicationManager replicationManager;
private ReplicationManagerMetrics metrics;
@BeforeEach
@@ -58,7 +57,8 @@ public class TestReplicationManagerMetrics {
LegacyReplicationManager.class);
Mockito.when(lrm.getInflightCount(Mockito.any(InflightType.class)))
.thenReturn(0);
- replicationManager = Mockito.mock(ReplicationManager.class);
+ ReplicationManager replicationManager =
+ Mockito.mock(ReplicationManager.class);
Mockito.when(replicationManager.getLegacyReplicationManager())
.thenReturn(lrm);
Mockito.when(replicationManager.getContainerReport()).thenReturn(report);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestUnderReplicatedProcessor.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestUnderReplicatedProcessor.java
index f3916b473c..60584a3e88 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestUnderReplicatedProcessor.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestUnderReplicatedProcessor.java
@@ -40,7 +40,6 @@ import static org.mockito.ArgumentMatchers.any;
*/
public class TestUnderReplicatedProcessor {
- private ConfigurationSource conf;
private ReplicationManager replicationManager;
private ECReplicationConfig repConfig;
private UnderReplicatedProcessor underReplicatedProcessor;
@@ -48,7 +47,7 @@ public class TestUnderReplicatedProcessor {
@Before
public void setup() {
- conf = new OzoneConfiguration();
+ ConfigurationSource conf = new OzoneConfiguration();
ReplicationManagerConfiguration rmConf =
conf.getObject(ReplicationManagerConfiguration.class);
replicationManager = Mockito.mock(ReplicationManager.class);
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 1c6a46e03c..4b8219d5ac 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
@@ -83,7 +83,7 @@ public class TestClosingContainerHandler {
ContainerReplicaProto.State.CLOSING, 1, 2, 3, 4, 5);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -101,7 +101,7 @@ public class TestClosingContainerHandler {
ContainerReplicaProto.State.CLOSING, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -129,7 +129,7 @@ public class TestClosingContainerHandler {
containerReplicas.add(openReplica);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -152,7 +152,7 @@ public class TestClosingContainerHandler {
containerReplicas.add(openReplica);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestDeletingContainerHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestDeletingContainerHandler.java
index 0cebdc3007..bc233754f1 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestDeletingContainerHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestDeletingContainerHandler.java
@@ -88,7 +88,7 @@ public class TestDeletingContainerHandler {
ContainerReplicaProto.State.CLOSING, 1, 2, 3, 4, 5);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -106,7 +106,7 @@ public class TestDeletingContainerHandler {
ContainerReplicaProto.State.CLOSING, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -139,7 +139,7 @@ public class TestDeletingContainerHandler {
Set<ContainerReplica> containerReplicas = new HashSet<>();
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestMismatchedReplicasHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestMismatchedReplicasHandler.java
index 714156fb5d..cb5f4649e4 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestMismatchedReplicasHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestMismatchedReplicasHandler.java
@@ -67,7 +67,7 @@ public class TestMismatchedReplicasHandler {
ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo(
ecReplicationConfig, 1, OPEN);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(Collections.emptySet())
@@ -87,7 +87,7 @@ public class TestMismatchedReplicasHandler {
ReplicationTestUtil.createReplicas(containerInfo.containerID(),
ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4, 5);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -122,7 +122,7 @@ public class TestMismatchedReplicasHandler {
containerReplicas.add(mismatch2);
containerReplicas.add(mismatch3);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -149,7 +149,7 @@ public class TestMismatchedReplicasHandler {
ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo(
ratisReplicationConfig, 1, OPEN);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(Collections.emptySet())
@@ -169,7 +169,7 @@ public class TestMismatchedReplicasHandler {
ReplicationTestUtil.createReplicas(containerInfo.containerID(),
ContainerReplicaProto.State.CLOSED, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -202,7 +202,7 @@ public class TestMismatchedReplicasHandler {
containerReplicas.add(mismatch2);
containerReplicas.add(mismatch3);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestOpenContainerHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestOpenContainerHandler.java
index 5eae9ff045..4ed8beea75 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestOpenContainerHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestOpenContainerHandler.java
@@ -66,7 +66,7 @@ public class TestOpenContainerHandler {
.createReplicas(containerInfo.containerID(),
ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4, 5);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -84,7 +84,7 @@ public class TestOpenContainerHandler {
.createReplicas(containerInfo.containerID(),
ContainerReplicaProto.State.OPEN, 1, 2, 3, 4, 5);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -102,7 +102,7 @@ public class TestOpenContainerHandler {
.createReplicas(containerInfo.containerID(),
ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -120,7 +120,7 @@ public class TestOpenContainerHandler {
.createReplicas(containerInfo.containerID(),
ContainerReplicaProto.State.CLOSED, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -138,7 +138,7 @@ public class TestOpenContainerHandler {
.createReplicas(containerInfo.containerID(),
ContainerReplicaProto.State.OPEN, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -156,7 +156,7 @@ public class TestOpenContainerHandler {
.createReplicas(containerInfo.containerID(),
ContainerReplicaProto.State.CLOSED, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestQuasiClosedContainerHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestQuasiClosedContainerHandler.java
index b2a7fce088..da1b818a06 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestQuasiClosedContainerHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestQuasiClosedContainerHandler.java
@@ -75,7 +75,7 @@ public class TestQuasiClosedContainerHandler {
.createReplicas(containerInfo.containerID(),
State.QUASI_CLOSED, 1, 2, 3);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -94,7 +94,7 @@ public class TestQuasiClosedContainerHandler {
.createReplicas(containerInfo.containerID(),
State.OPEN, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -123,7 +123,7 @@ public class TestQuasiClosedContainerHandler {
HddsProtos.NodeOperationalState.IN_SERVICE, State.OPEN);
containerReplicas.add(openReplica);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -147,7 +147,7 @@ public class TestQuasiClosedContainerHandler {
.createReplicasWithSameOrigin(containerInfo.containerID(),
State.QUASI_CLOSED, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -177,7 +177,7 @@ public class TestQuasiClosedContainerHandler {
HddsProtos.NodeOperationalState.IN_SERVICE, State.QUASI_CLOSED);
containerReplicas.add(quasiClosed);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
@@ -219,7 +219,7 @@ public class TestQuasiClosedContainerHandler {
containerReplicas.add(replicaThree);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
- .setPendingOps(Collections.EMPTY_LIST)
+ .setPendingOps(Collections.emptyList())
.setReport(new ReplicationManagerReport())
.setContainerInfo(containerInfo)
.setContainerReplicas(containerReplicas)
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/package-info.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/package-info.java
index aa74ea7d1a..96a83ff3a5 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/package-info.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/package-info.java
@@ -17,7 +17,6 @@
*
*/
/**
- * SCM Testing and Mocking Utils.
+ * Test classes for Replication functionality.
*/
package org.apache.hadoop.hdds.scm.container.replication;
-// Test classes for Replication functionality.
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 6ea0851b2b..8d65d1bcaa 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
@@ -163,7 +163,7 @@ public class TestContainerPlacement {
scmhaManager, sequenceIdGen, pipelineManager,
SCMDBDefinition.CONTAINERS.getTable(dbStore),
new ContainerReplicaPendingOps(
- conf, Clock.system(ZoneId.systemDefault())));
+ Clock.system(ZoneId.systemDefault())));
}
/**
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
index 3f52ccdf9c..941bc52658 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
@@ -208,7 +208,7 @@ public class ReconStorageContainerManagerFacade
scmhaManager,
scmContext);
ContainerReplicaPendingOps pendingOps = new ContainerReplicaPendingOps(
- conf, Clock.system(ZoneId.systemDefault()));
+ Clock.system(ZoneId.systemDefault()));
this.containerManager = new ReconContainerManager(conf,
dbStore,
ReconSCMDBDefinition.CONTAINERS.getTable(dbStore),
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java
index dec0b70165..eb62b7d3ec 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java
@@ -112,7 +112,7 @@ public class AbstractReconContainerManagerTest {
scmhaManager,
scmContext);
ContainerReplicaPendingOps pendingOps = new ContainerReplicaPendingOps(
- conf, Clock.system(ZoneId.systemDefault()));
+ Clock.system(ZoneId.systemDefault()));
containerManager = new ReconContainerManager(
conf,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
