Skip to content

HDDS-3921. IllegalArgumentException triggered in SCMContainerPlacemen… #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChenSammi merged 3 commits into from
Jul 13, 2020
Merged

HDDS-3921. IllegalArgumentException triggered in SCMContainerPlacemen… #1162

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a055982
HDDS-3921. IllegalArgumentException triggered in SCMContainerPlacemen…
ChenSammi Jul 4, 2020
091a7b6
address comments
ChenSammi Jul 9, 2020
277b028
trigger new CI check
adoroszlai Jul 10, 2020
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
12 changes: 8 additions & 4 deletions ...dds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ private void forceCloseContainer(final ContainerInfo container,
*/
private void handleUnderReplicatedContainer(final ContainerInfo container,
final Set<ContainerReplica> replicas) {
LOG.debug("Handling underreplicated container: {}",
LOG.debug("Handling under-replicated container: {}",
container.getContainerID());
try {
final ContainerID id = container.containerID();
Expand Down Expand Up @@ -543,14 +543,18 @@ private void handleUnderReplicatedContainer(final ContainerInfo container,
List<DatanodeDetails> targetReplicas = new ArrayList<>(source);
// Then add any pending additions
targetReplicas.addAll(replicationInFlight);

int delta = replicationFactor - getReplicaCount(id, replicas);
final ContainerPlacementStatus placementStatus =
containerPlacement.validateContainerPlacement(
targetReplicas, replicationFactor);
int delta = replicationFactor - getReplicaCount(id, replicas);
final int misRepDelta = placementStatus.misReplicationCount();
final int replicasNeeded
= delta < misRepDelta ? misRepDelta : delta;
if (replicasNeeded <= 0) {
LOG.debug("Container {} meets replication requirement with " +
"inflight replicas", id);
return;
}

final List<DatanodeDetails> excludeList = replicas.stream()
.map(ContainerReplica::getDatanodeDetails)
Expand Down Expand Up @@ -611,7 +615,7 @@ private void handleOverReplicatedContainer(final ContainerInfo container,

final ContainerID id = container.containerID();
final int replicationFactor = container.getReplicationFactor().getNumber();
// Dont consider inflight replication while calculating excess here.
// Don't consider inflight replication while calculating excess here.
int excess = replicas.size() - replicationFactor -
inflightDeletion.getOrDefault(id, Collections.emptyList()).size();

Expand Down