Skip to content

HDDS-12655. Optimize Recon Container Mismatch API while getting containerInfos & ContainerMetadata. - ( OM Changes ) #8855

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

Closed
ArafatKhan2198 wants to merge 1 commit into from
Closed

HDDS-12655. Optimize Recon Container Mismatch API while getting containerInfos & ContainerMetadata. - ( OM Changes ) #8855

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
78 changes: 44 additions & 34 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
Expand Down Expand Up @@ -581,50 +582,59 @@ public Response getContainerMisMatchInsights(

List<ContainerDiscrepancyInfo> containerDiscrepancyInfoList =
new ArrayList<>();
Long minContainerID = prevKey + 1;
Iterator<ContainerInfo> scmNonDeletedContainers =
containerManager.getContainers().stream()
.filter(containerInfo -> (containerInfo.getContainerID() >= minContainerID))
.filter(containerInfo -> containerInfo.getState() != HddsProtos.LifeCycleState.DELETED)
.sorted(Comparator.comparingLong(ContainerInfo::getContainerID)).iterator();
ContainerInfo scmContainerInfo = scmNonDeletedContainers.hasNext() ?
scmNonDeletedContainers.next() : null;
DataFilter dataFilter = DataFilter.fromValue(missingIn.toUpperCase());
try (SeekableIterator<Long, ContainerMetadata> omContainers =
reconContainerMetadataManager.getContainersIterator()) {
omContainers.seek(minContainerID);
ContainerMetadata containerMetadata = omContainers.hasNext() ? omContainers.next() : null;
switch (dataFilter) {
case SCM:
List<ContainerMetadata> notSCMContainers = new ArrayList<>();
while (containerMetadata != null && notSCMContainers.size() < limit) {
Long omContainerID = containerMetadata.getContainerID();
Long scmContainerID = scmContainerInfo == null ? null : scmContainerInfo.getContainerID();
if (omContainerID.equals(scmContainerID)) {
containerMetadata = omContainers.hasNext() ? omContainers.next() : null;
scmContainerInfo = scmNonDeletedContainers.hasNext() ? scmNonDeletedContainers.next() : null;
} else if (scmContainerID == null || omContainerID.compareTo(scmContainerID) < 0) {
notSCMContainers.add(containerMetadata);
containerMetadata = omContainers.hasNext() ? omContainers.next() : null;
} else {
scmContainerInfo = scmNonDeletedContainers.hasNext() ? scmNonDeletedContainers.next() : null;
}
// Optimized approach: Iterate through OM containers and check existence in SCM
// Start from prevKey + 1 if specified
if (prevKey > 0) {
omContainers.seek(prevKey + 1);
}

while (omContainers.hasNext() && containerDiscrepancyInfoList.size() < limit) {
ContainerMetadata omContainer = omContainers.next();
Long omContainerID = omContainer.getContainerID();

// Check if container exists in SCM and is not deleted
boolean existsInSCM = false;
try {
ContainerInfo scmContainerInfo = containerManager.getContainer(ContainerID.valueOf(omContainerID));
// Container exists in SCM, check if it's not deleted
existsInSCM = (scmContainerInfo != null &&
scmContainerInfo.getState() != HddsProtos.LifeCycleState.DELETED);
} catch (ContainerNotFoundException e) {
// Container doesn't exist in SCM
existsInSCM = false;
}

notSCMContainers.forEach(nonSCMContainer -> {
ContainerDiscrepancyInfo containerDiscrepancyInfo =
new ContainerDiscrepancyInfo();
containerDiscrepancyInfo.setContainerID(nonSCMContainer.getContainerID());
containerDiscrepancyInfo.setNumberOfKeys(
nonSCMContainer.getNumberOfKeys());
containerDiscrepancyInfo.setPipelines(
nonSCMContainer.getPipelines());
containerDiscrepancyInfo.setExistsAt("OM");
containerDiscrepancyInfoList.add(containerDiscrepancyInfo);
});
// If container doesn't exist in SCM, add to discrepancy list
if (!existsInSCM) {
ContainerDiscrepancyInfo containerDiscrepancyInfo = new ContainerDiscrepancyInfo();
containerDiscrepancyInfo.setContainerID(omContainerID);
containerDiscrepancyInfo.setNumberOfKeys(omContainer.getNumberOfKeys());
containerDiscrepancyInfo.setPipelines(omContainer.getPipelines());
containerDiscrepancyInfo.setExistsAt("OM");
containerDiscrepancyInfoList.add(containerDiscrepancyInfo);
}
}
break;

case OM:
// Initialize variables needed for OM case dual-iterator approach
Long minContainerID = prevKey + 1;
Iterator<ContainerInfo> scmNonDeletedContainers =
containerManager.getContainers().stream()
.filter(containerInfo -> (containerInfo.getContainerID() >= minContainerID))
.filter(containerInfo -> containerInfo.getState() != HddsProtos.LifeCycleState.DELETED)
.sorted(Comparator.comparingLong(ContainerInfo::getContainerID)).iterator();
ContainerInfo scmContainerInfo = scmNonDeletedContainers.hasNext() ?
scmNonDeletedContainers.next() : null;

omContainers.seek(minContainerID);
ContainerMetadata containerMetadata = omContainers.hasNext() ? omContainers.next() : null;

List<ContainerInfo> nonOMContainers = new ArrayList<>();
while (scmContainerInfo != null && nonOMContainers.size() < limit) {
Long omContainerID = containerMetadata == null ? null : containerMetadata.getContainerID();
Expand Down