HDDS-8326. Container Level Info - OM DB Insights. #4509
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,11 +41,17 @@ | |
| import org.apache.commons.lang3.StringUtils; | ||
| 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; | ||
| import org.apache.hadoop.hdds.scm.pipeline.PipelineNotFoundException; | ||
| import org.apache.hadoop.hdds.scm.server.OzoneStorageContainerManager; | ||
| import org.apache.hadoop.ozone.om.helpers.BucketLayout; | ||
| import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; | ||
| import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; | ||
| import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup; | ||
| import org.apache.hadoop.ozone.recon.api.types.ContainerDiscrepancyInfo; | ||
| import org.apache.hadoop.ozone.recon.api.types.ContainerKeyPrefix; | ||
| import org.apache.hadoop.ozone.recon.api.types.ContainerMetadata; | ||
| import org.apache.hadoop.ozone.recon.api.types.ContainersResponse; | ||
|
|
@@ -91,6 +97,7 @@ public class ContainerEndpoint { | |
| private ReconOMMetadataManager omMetadataManager; | ||
|
|
||
| private final ReconContainerManager containerManager; | ||
| private final PipelineManager pipelineManager; | ||
| private final ContainerHealthSchemaManager containerHealthSchemaManager; | ||
| private final ReconNamespaceSummaryManager reconNamespaceSummaryManager; | ||
| private final OzoneStorageContainerManager reconSCM; | ||
|
|
@@ -104,6 +111,7 @@ public ContainerEndpoint(OzoneStorageContainerManager reconSCM, | |
| ReconNamespaceSummaryManager reconNamespaceSummaryManager) { | ||
| this.containerManager = | ||
| (ReconContainerManager) reconSCM.getContainerManager(); | ||
| this.pipelineManager = reconSCM.getPipelineManager(); | ||
| this.containerHealthSchemaManager = containerHealthSchemaManager; | ||
| this.reconNamespaceSummaryManager = reconNamespaceSummaryManager; | ||
| this.reconSCM = reconSCM; | ||
|
|
@@ -417,4 +425,78 @@ private List<ContainerBlockMetadata> getBlocks( | |
| private BucketLayout getBucketLayout() { | ||
| return BucketLayout.DEFAULT; | ||
| } | ||
|
|
||
| @GET | ||
| @Path("insights/containermismatch") | ||
| public Response getContainerMisMatchInsights() { | ||
| List<ContainerDiscrepancyInfo> containerDiscrepancyInfoList = | ||
| new ArrayList<>(); | ||
| try { | ||
| Map<Long, ContainerMetadata> omContainers = | ||
| reconContainerMetadataManager.getContainers(-1, -1); | ||
| List<Long> scmContainers = containerManager.getContainers().stream() | ||
|
There was a problem hiding this comment. Assume this scmContainers are which are is not in DELETED state?
Contributor
Author
There was a problem hiding this comment. Yes, this is SCM container list irrespective of their state. There was a problem hiding this comment. 1-In this case all SCM Containers when compared with OM Containers , will show all Deleted State containers as discrepancy i.e missing in OM
Contributor
There was a problem hiding this comment. @devmadhuu @krishnaasawa1 Yes, we need consider non-deleted state of containers. This is like a dataloss only if OM have referred container but that container is not present / deleted.
Contributor
Author
There was a problem hiding this comment.
|
||
| .map(containerInfo -> containerInfo.getContainerID()).collect( | ||
| Collectors.toList()); | ||
|
|
||
| // Filter list of container Ids which are present in OM but not in SCM. | ||
| List<Map.Entry<Long, ContainerMetadata>> notSCMContainers = | ||
| omContainers.entrySet().stream().filter(containerMetadataEntry -> | ||
| !(scmContainers.contains(containerMetadataEntry.getKey()))) | ||
| .collect( | ||
| Collectors.toList()); | ||
|
|
||
| notSCMContainers.forEach(nonSCMContainer -> { | ||
|
There was a problem hiding this comment. notSCMContainers List will be empty in normal scenario and only if some thing went wrong will have it populated.
Contributor
Author
There was a problem hiding this comment. foreach will not execute if list is empty, so no check required. |
||
| ContainerDiscrepancyInfo containerDiscrepancyInfo = | ||
| new ContainerDiscrepancyInfo(); | ||
| containerDiscrepancyInfo.setContainerID(nonSCMContainer.getKey()); | ||
| containerDiscrepancyInfo.setNumberOfKeys( | ||
| nonSCMContainer.getValue().getNumberOfKeys()); | ||
| containerDiscrepancyInfo.setPipelines(nonSCMContainer.getValue() | ||
| .getPipelines()); | ||
| containerDiscrepancyInfo.setExistsAt("OM"); | ||
| containerDiscrepancyInfoList.add(containerDiscrepancyInfo); | ||
| }); | ||
|
|
||
| // Filter list of container Ids which are present in SCM but not in OM. | ||
| List<Long> nonOMContainers = scmContainers.stream() | ||
| .filter(containerId -> !omContainers.containsKey(containerId)) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| List<Pipeline> pipelines = new ArrayList<>(); | ||
| nonOMContainers.forEach(nonOMContainerId -> { | ||
|
There was a problem hiding this comment. Here again need a check if nonOMContainers empty
Contributor
Author
There was a problem hiding this comment. foreach will not execute if list is empty, so no check required. |
||
| ContainerDiscrepancyInfo containerDiscrepancyInfo = | ||
| new ContainerDiscrepancyInfo(); | ||
| containerDiscrepancyInfo.setContainerID(nonOMContainerId); | ||
| containerDiscrepancyInfo.setNumberOfKeys(0); | ||
| PipelineID pipelineID = null; | ||
| try { | ||
| pipelineID = containerManager.getContainer( | ||
| ContainerID.valueOf(nonOMContainerId)) | ||
| .getPipelineID(); | ||
|
|
||
| if (null != pipelineID) { | ||
| pipelines.add(pipelineManager.getPipeline(pipelineID)); | ||
| } | ||
| } catch (ContainerNotFoundException e) { | ||
| LOG.warn("Container {} not found in SCM: {}", nonOMContainerId, e); | ||
| } catch (PipelineNotFoundException e) { | ||
| LOG.debug("Pipeline not found for container: {} and pipelineId: {}", | ||
| nonOMContainerId, pipelineID, e); | ||
| } | ||
| containerDiscrepancyInfo.setPipelines(pipelines); | ||
| containerDiscrepancyInfo.setExistsAt("SCM"); | ||
| containerDiscrepancyInfoList.add(containerDiscrepancyInfo); | ||
| }); | ||
|
|
||
| } catch (IOException ex) { | ||
| throw new WebApplicationException(ex, | ||
| Response.Status.INTERNAL_SERVER_ERROR); | ||
| } catch (IllegalArgumentException e) { | ||
| throw new WebApplicationException(e, Response.Status.BAD_REQUEST); | ||
| } catch (Exception ex) { | ||
| throw new WebApplicationException(ex, | ||
| Response.Status.INTERNAL_SERVER_ERROR); | ||
| } | ||
| return Response.ok(containerDiscrepancyInfoList).build(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * 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 | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.ozone.recon.api.types; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import org.apache.hadoop.hdds.scm.pipeline.Pipeline; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Metadata object that represents a Container Discrepancy Info. | ||
| */ | ||
| public class ContainerDiscrepancyInfo { | ||
|
|
||
| @JsonProperty("containerId") | ||
| private long containerID; | ||
|
|
||
| @JsonProperty("omContainerState") | ||
| @JsonInclude(JsonInclude.Include.NON_EMPTY) | ||
| private long omContainerState; | ||
|
|
||
| @JsonProperty("scmContainerState") | ||
| @JsonInclude(JsonInclude.Include.NON_EMPTY) | ||
| private long scmContainerState; | ||
|
Contributor
There was a problem hiding this comment. It looks like scmContainerState and omContainerState are not used in anywhere.
Contributor
Author
There was a problem hiding this comment.
Thanks for pointing out Sammi, I have removed them, earlier I was thinking to use, but I don't have a mechanism to for states of mismatched containers. Pls review again. |
||
|
|
||
| @JsonProperty("numberOfKeys") | ||
| private long numberOfKeys; | ||
|
|
||
| @JsonProperty("pipelines") | ||
| private List<Pipeline> pipelines; | ||
|
|
||
| @JsonProperty("existsAt") | ||
| private String existsAt; | ||
|
|
||
| public ContainerDiscrepancyInfo() { | ||
|
|
||
| } | ||
|
|
||
| public long getContainerID() { | ||
| return containerID; | ||
| } | ||
|
|
||
| public void setContainerID(long containerID) { | ||
| this.containerID = containerID; | ||
| } | ||
|
|
||
| public long getNumberOfKeys() { | ||
| return numberOfKeys; | ||
| } | ||
|
|
||
| public void setNumberOfKeys(long numberOfKeys) { | ||
| this.numberOfKeys = numberOfKeys; | ||
| } | ||
|
|
||
| public long getOmContainerState() { | ||
| return omContainerState; | ||
| } | ||
|
|
||
| public void setOmContainerState(long omContainerState) { | ||
| this.omContainerState = omContainerState; | ||
| } | ||
|
|
||
| public long getScmContainerState() { | ||
| return scmContainerState; | ||
| } | ||
|
|
||
| public void setScmContainerState(long scmContainerState) { | ||
| this.scmContainerState = scmContainerState; | ||
| } | ||
|
|
||
| public List<Pipeline> getPipelines() { | ||
| return pipelines; | ||
| } | ||
|
|
||
| public void setPipelines( | ||
| List<Pipeline> pipelines) { | ||
| this.pipelines = pipelines; | ||
| } | ||
|
|
||
| public String getExistsAt() { | ||
| return existsAt; | ||
| } | ||
|
|
||
| public void setExistsAt(String existsAt) { | ||
| this.existsAt = existsAt; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
path can be /containers/mismatch which aligns with current container APIs. In API "insights" is not required.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes done and pushed