Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dev-support/pmd/pmd-ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

<rule ref="category/java/bestpractices.xml/ForLoopCanBeForeach"/>
<rule ref="category/java/bestpractices.xml/MissingOverride"/>
<rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>

<exclude-pattern>.*/generated-sources/.*</exclude-pattern>
</ruleset>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.container.keyvalue;

import static org.apache.ozone.test.GenericTestUtils.toLog4j;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
Expand Down Expand Up @@ -529,12 +528,4 @@ private KeyValueContainer createOpenContainer(int normalBlocks)
throws Exception {
return super.createContainerWithBlocks(CONTAINER_ID, normalBlocks, 0, true);
}

private void containsAllStrings(String logOutput, String[] expectedMessages) {
for (String expectedMessage : expectedMessages) {
assertThat(logOutput)
.withFailMessage("Log output did not contain \"" + expectedMessage + "\"")
.contains(expectedMessage);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class TestSecretKeyManager {
private SecretKeyStore mockedKeyStore;

@BeforeEach
private void setup() {
void setup() {
mockedKeyStore = mock(SecretKeyStore.class);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm.container.balancer;

import static java.time.OffsetDateTime.now;
import static java.util.Collections.emptyMap;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_NODE_REPORT_INTERVAL;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_NODE_REPORT_INTERVAL_DEFAULT;
import static org.apache.hadoop.util.StringUtils.byteDesc;
Expand Down Expand Up @@ -410,53 +409,6 @@ private ContainerBalancerTaskIterationStatusInfo createCurrentIterationStatistic
}
}

private static ContainerBalancerTaskIterationStatusInfo getEmptyCurrentIterationStatistic(
long iterationDuration) {
ContainerMoveInfo containerMoveInfo = new ContainerMoveInfo(0, 0, 0, 0);
DataMoveInfo dataMoveInfo = new DataMoveInfo(
0,
0,
emptyMap(),
emptyMap()
);
IterationInfo iterationInfo = new IterationInfo(
0,
null,
iterationDuration
);
return new ContainerBalancerTaskIterationStatusInfo(
iterationInfo,
containerMoveInfo,
dataMoveInfo
);
}

private ContainerBalancerTaskIterationStatusInfo getFilledCurrentIterationStatistic(int lastIterationNumber,
long iterationDuration) {
Map<UUID, Long> sizeEnteringDataToNodes =
convertToNodeIdToTrafficMap(findTargetStrategy.getSizeEnteringNodes());
Map<UUID, Long> sizeLeavingDataFromNodes =
convertToNodeIdToTrafficMap(findSourceStrategy.getSizeLeavingNodes());

ContainerMoveInfo containerMoveInfo = new ContainerMoveInfo(metrics);
DataMoveInfo dataMoveInfo = new DataMoveInfo(
getSizeScheduledForMoveInLatestIteration(),
sizeActuallyMovedInLatestIteration,
sizeEnteringDataToNodes,
sizeLeavingDataFromNodes
);
IterationInfo iterationInfo = new IterationInfo(
lastIterationNumber + 1,
null,
iterationDuration
);
return new ContainerBalancerTaskIterationStatusInfo(
iterationInfo,
containerMoveInfo,
dataMoveInfo
);
}

private long getCurrentIterationDuration() {
if (currentIterationStarted == null) {
return ABSENCE_OF_DURATION;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -997,20 +997,6 @@ public NodeStatus getNodeStatus(DatanodeDetails datanode)
return nodeManager.getNodeStatus(datanode);
}

/**
* An open container is healthy if all its replicas are in the same state as
* the container.
* @param container The container to check
* @param replicas The replicas belonging to the container
* @return True if the container is healthy, false otherwise
*/
private boolean isOpenContainerHealthy(
ContainerInfo container, Set<ContainerReplica> replicas) {
HddsProtos.LifeCycleState state = container.getState();
return replicas.stream()
.allMatch(r -> compareState(state, r.getState()));
}

/**
* Compares the container state with the replica state.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.metrics2.util.MBeans;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.container.common.impl.StorageLocationReport;
import org.slf4j.Logger;
Expand Down Expand Up @@ -124,19 +123,6 @@ public void insertNewDatanode(UUID datanodeID,
}
}

//TODO: This should be called once SCMNodeManager gets Started.
private void registerMXBean() {
this.scmNodeStorageInfoBean = MBeans.register("StorageContainerManager",
"scmNodeStorageInfo", this);
}

//TODO: Unregister call should happen as a part of SCMNodeManager shutdown.
private void unregisterMXBean() {
if (this.scmNodeStorageInfoBean != null) {
MBeans.unregister(this.scmNodeStorageInfoBean);
this.scmNodeStorageInfoBean = null;
}
}
/**
* Updates the Container list of an existing DN.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -590,16 +590,4 @@ private void startBalancer(ContainerBalancerConfiguration config)
private void stopBalancer() {
// do nothing as testcase is not threaded
}

private CompletableFuture<MoveManager.MoveResult>
genCompletableFuture(int sleepMilSec) {
return CompletableFuture.supplyAsync(() -> {
try {
Thread.sleep(sleepMilSec);
} catch (InterruptedException e) {
e.printStackTrace();
}
return MoveManager.MoveResult.COMPLETED;
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -498,35 +498,35 @@ public static class Expectation {
private int underReplicatedQueue = 0;
private int overReplicatedQueue = 0;

private void setUnderReplicated(int underReplicated) {
public void setUnderReplicated(int underReplicated) {
stateCounts.put(ReplicationManagerReport.HealthState.UNDER_REPLICATED, underReplicated);
}

private void setOverReplicated(int overReplicated) {
public void setOverReplicated(int overReplicated) {
stateCounts.put(ReplicationManagerReport.HealthState.OVER_REPLICATED, overReplicated);
}

private void setMisReplicated(int misReplicated) {
public void setMisReplicated(int misReplicated) {
stateCounts.put(ReplicationManagerReport.HealthState.MIS_REPLICATED, misReplicated);
}

private void setUnhealthy(int unhealthy) {
public void setUnhealthy(int unhealthy) {
stateCounts.put(ReplicationManagerReport.HealthState.UNHEALTHY, unhealthy);
}

private void setMissing(int missing) {
public void setMissing(int missing) {
stateCounts.put(ReplicationManagerReport.HealthState.MISSING, missing);
}

private void setEmpty(int empty) {
public void setEmpty(int empty) {
stateCounts.put(ReplicationManagerReport.HealthState.EMPTY, empty);
}

private void setQuasiClosedStuck(int quasiClosedStuck) {
public void setQuasiClosedStuck(int quasiClosedStuck) {
stateCounts.put(ReplicationManagerReport.HealthState.QUASI_CLOSED_STUCK, quasiClosedStuck);
}

private void setOpenUnhealthy(int openUnhealthy) {
public void setOpenUnhealthy(int openUnhealthy) {
stateCounts.put(ReplicationManagerReport.HealthState.OPEN_UNHEALTHY, openUnhealthy);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -618,14 +617,6 @@ private boolean checkDuplicateNodesUUID(List<DatanodeDetails> nodes) {
return uuids.size() == nodes.size();
}

private Set<PipelineID> mockPipelineIDs(int count) {
Set<PipelineID> pipelineIDs = new HashSet<>(count);
for (int i = 0; i < count; i++) {
pipelineIDs.add(PipelineID.randomId());
}
return pipelineIDs;
}

private void insertHeavyNodesIntoNodeManager(
List<DatanodeDetails> nodes, int heavyNodeCount)
throws IOException, TimeoutException {
Expand Down
Loading