Skip to content

HDDS-8359. ReplicationManager: Fix getContainerReplicationHealth() so that it builds ContainerCheckRequest correctly #4528

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
adoroszlai merged 1 commit into from
Apr 4, 2023
Merged

HDDS-8359. ReplicationManager: Fix getContainerReplicationHealth() so that it builds ContainerCheckRequest correctly #4528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions ...cm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,14 +994,16 @@ public ContainerReplicaCount getContainerReplicaCount(ContainerID containerID)
*/
public ContainerHealthResult getContainerReplicationHealth(
ContainerInfo containerInfo, Set<ContainerReplica> replicas) {
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
ContainerCheckRequest.Builder request = new ContainerCheckRequest.Builder()
.setContainerInfo(containerInfo)
.setContainerReplicas(replicas)
.build();
.setPendingOps(getPendingReplicationOps(containerInfo.containerID()));
if (containerInfo.getReplicationConfig().getReplicationType() == EC) {
return ecReplicationCheckHandler.checkHealth(request);
request.setMaintenanceRedundancy(maintenanceRedundancy);
return ecReplicationCheckHandler.checkHealth(request.build());
} else {
return ratisReplicationCheckHandler.checkHealth(request);
request.setMaintenanceRedundancy(ratisMaintenanceMinReplicas);
return ratisReplicationCheckHandler.checkHealth(request.build());
}
}

Expand Down
31 changes: 31 additions & 0 deletions ...rc/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,37 @@ public void testUnderReplicatedContainer() throws ContainerNotFoundException {
ReplicationManagerReport.HealthState.UNDER_REPLICATED));
}

/**
* {@link
* ReplicationManager#getContainerReplicationHealth(ContainerInfo, Set)}
* should return under replicated result for an under replicated container.
*/
@Test
public void testGetContainerReplicationHealthForUnderReplicatedContainer() {
ContainerInfo container = createContainerInfo(repConfig, 1,
HddsProtos.LifeCycleState.CLOSED);
Set<ContainerReplica> replicas =
addReplicas(container, ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4);

ContainerHealthResult result =
replicationManager.getContainerReplicationHealth(container, replicas);
Assert.assertEquals(ContainerHealthResult.HealthState.UNDER_REPLICATED,
result.getHealthState());

// Test the same for a RATIS container
RatisReplicationConfig ratisRepConfig =
RatisReplicationConfig.getInstance(THREE);
container = createContainerInfo(ratisRepConfig, 1L,
HddsProtos.LifeCycleState.CLOSED);
replicas = addReplicas(container, ContainerReplicaProto.State.CLOSED, 0,
0);

result =
replicationManager.getContainerReplicationHealth(container, replicas);
Assert.assertEquals(ContainerHealthResult.HealthState.UNDER_REPLICATED,
result.getHealthState());
}

@Test
public void testUnderReplicatedContainerFixedByPending()
throws ContainerNotFoundException {
Expand Down