Skip to content

ATLAS-5381: Handle empty/corrupted reference vertices during entity delete and purge traversal #740

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
mandarambawane merged 2 commits into from
Aug 25, 2026
Merged

ATLAS-5381: Handle empty/corrupted reference vertices during entity delete and purge traversal #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4414c84
ATLAS-5381: Handle empty/corrupted reference vertices during entity d…
sheetal-shah-cloudera Aug 20, 2026
a76520b
ATLAS-5381: Add empty reference vertex delete-path tests in DeleteHan…
sheetal-shah-cloudera Aug 24, 2026
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
94 changes: 82 additions & 12 deletions repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerV1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
import static org.apache.atlas.repository.Constants.PROPAGATED_TRAIT_NAMES_PROPERTY_KEY;
import static org.apache.atlas.repository.Constants.RELATIONSHIPTYPE_TAG_PROPAGATION_KEY;
import static org.apache.atlas.repository.Constants.RELATIONSHIP_GUID_PROPERTY_KEY;
import static org.apache.atlas.repository.Constants.TYPE_NAME_PROPERTY_KEY;
import static org.apache.atlas.repository.graph.GraphHelper.getAllClassificationEdges;
import static org.apache.atlas.repository.graph.GraphHelper.getAssociatedEntityVertex;
import static org.apache.atlas.repository.graph.GraphHelper.getBlockedClassificationIds;
Expand Down Expand Up @@ -207,8 +206,14 @@ public Set<AtlasVertex> accumulateDeletionCandidates(Collection<AtlasVertex> ins
deletionCandidateVertices.add(vertexInfo.getVertex());
}

AtlasEntityHeader entity = entityRetriever.toAtlasEntityHeader(instanceVertex);
AtlasEntityType entityType = typeRegistry.getEntityTypeByName(entity.getTypeName());
// Root type unreadable — skip linked process/column-lineage collection; still queue the vertex for delete.
AtlasEntityType entityType = resolveEntityType(instanceVertex);
if (entityType == null) {
if (GraphHelper.elementExists(instanceVertex) && !deletionCandidateVertices.contains(instanceVertex)) {
deletionCandidateVertices.add(instanceVertex);
}
continue;
}

if (entityType.getEntityDef().hasSuperType(ATLAS_TYPE_DATASET)) {
addUpstreamProcessEntities(instanceVertex, deletionCandidateVertices, instanceVertexGuids);
Expand Down Expand Up @@ -295,6 +300,11 @@ public void addUpstreamProcessEntities(AtlasVertex entityVertex, Set<AtlasVertex
AtlasEdge edge = edgeIterator.next();
AtlasVertex processVertex = edge.getOutVertex();

// Skip empty reference vertices on upstream process edges.
if (isUnreadableEntityVertex(processVertex)) {
continue;
}

String guid = processVertex.getProperty(GUID_PROPERTY_KEY, String.class);
if (instanceVertexGuids.contains(guid)) {
return; // already added
Expand Down Expand Up @@ -324,8 +334,11 @@ public void addUpstreamProcessEntities(AtlasVertex entityVertex, Set<AtlasVertex
public void getColumnLineageEntities(AtlasVertex process, Set<AtlasVertex> deletionCandidateVertices) throws AtlasBaseException {
RequestContext requestContext = RequestContext.get();

AtlasEntityHeader entity = entityRetriever.toAtlasEntityHeader(process);
AtlasEntityType entityType = typeRegistry.getEntityTypeByName(entity.getTypeName());
AtlasEntityType entityType = resolveEntityType(process);
if (entityType == null) {
return; // Process vertex unreadable — skip column-lineage collection
}

Map<String, Map<String, AtlasAttribute>> relationshipAttributes = entityType.getRelationshipAttributes();
Map<String, AtlasAttribute> columnLineages = relationshipAttributes.get(RELATIONSHIP_ATTRIBUTE_KEY_STRING);

Expand All @@ -339,7 +352,13 @@ public void getColumnLineageEntities(AtlasVertex process, Set<AtlasVertex> delet

while (edgeIterator.hasNext()) {
AtlasVertex columnLineageVertex = edgeIterator.next().getOutVertex();
String typeName = columnLineageVertex.getProperty(TYPE_NAME_PROPERTY_KEY, String.class);

// Skip empty reference vertices during delete
if (isUnreadableEntityVertex(columnLineageVertex)) {
continue;
}

String typeName = GraphHelper.getTypeName(columnLineageVertex);

if (LOG.isDebugEnabled()) {
LOG.debug("Column-lineage candidate: type={}, guid={}, state={}, viaEdgeLabel={}, process={}",
Expand Down Expand Up @@ -464,7 +483,13 @@ public Collection<GraphHelper.VertexInfo> getOwnedVertices(AtlasVertex entityVer
vertices.push(entityVertex);

while (!vertices.isEmpty()) {
AtlasVertex vertex = vertices.pop();
AtlasVertex vertex = vertices.pop();

// Skip empty reference vertices during delete
if (isUnreadableEntityVertex(vertex)) {
continue;
}

AtlasEntity.Status state = getState(vertex);

//In case of purge If the reference vertex is active then skip it or else
Expand All @@ -479,14 +504,15 @@ public Collection<GraphHelper.VertexInfo> getOwnedVertices(AtlasVertex entityVer
continue;
}

AtlasEntityHeader entity = entityRetriever.toAtlasEntityHeader(vertex);
String typeName = entity.getTypeName();
AtlasEntityType entityType = typeRegistry.getEntityTypeByName(typeName);
AtlasEntityType entityType = typeRegistry.getEntityTypeByName(GraphHelper.getTypeName(vertex));

if (entityType == null) {
throw new AtlasBaseException(AtlasErrorCode.TYPE_NAME_INVALID, TypeCategory.ENTITY.name(), typeName);
LOG.warn("Vertex {} has unrecognized typeName {}. Skipping.", vertex.getId(), GraphHelper.getTypeName(vertex));
continue;
}

AtlasEntityHeader entity = entityRetriever.toAtlasEntityHeader(vertex);

vertexInfoMap.put(guid, new GraphHelper.VertexInfo(entity, vertex));

for (AtlasStructType.AtlasAttribute attributeInfo : entityType.getOwnedRefAttributes()) {
Expand Down Expand Up @@ -626,7 +652,8 @@ public boolean deleteEdgeReference(AtlasEdge edge, TypeCategory typeCategory, bo

AtlasVertex referencedVertex = entityRetriever.getReferencedEntityVertex(edge, relationshipDirection, entityVertex);

if (referencedVertex != null) {
// Do not update the other end of the edge if that vertex is an empty reference vertex.
if (referencedVertex != null && !isUnreadableEntityVertex(referencedVertex)) {
RequestContext requestContext = RequestContext.get();

if (!requestContext.isUpdatedEntity(GraphHelper.getGuid(referencedVertex))) {
Expand Down Expand Up @@ -1468,6 +1495,49 @@ private void deleteAllClassifications(AtlasVertex instanceVertex) throws AtlasBa
}
}

/**
* True when a vertex cannot be read as an entity during delete traversal (empty shell, missing
* guid/typeName, or already removed). Matches {@code EntityGraphRetriever} ATLAS-4605 behavior.
*/
private boolean isUnreadableEntityVertex(AtlasVertex vertex) {
if (vertex == null || !GraphHelper.elementExists(vertex)) {
return true;
}

if (CollectionUtils.isEmpty(vertex.getPropertyKeys())) {
LOG.warn("Reference vertex found empty with vertexId: {}. Skipping.", vertex.getId());
return true;
}

if (StringUtils.isEmpty(GraphHelper.getGuid(vertex))) {
LOG.warn("Vertex {} has no GUID. Skipping.", vertex.getId());
return true;
}

if (StringUtils.isEmpty(GraphHelper.getTypeName(vertex))) {
LOG.warn("Vertex {} has empty typeName. Skipping.", vertex.getId());
return true;
}

return false;
}

/** Resolves entity type for delete traversal; returns null when vertex is unreadable or type unknown. */
private AtlasEntityType resolveEntityType(AtlasVertex vertex) throws AtlasBaseException {
if (isUnreadableEntityVertex(vertex)) {
return null;
}

String typeName = GraphHelper.getTypeName(vertex);
AtlasEntityType entityType = typeRegistry.getEntityTypeByName(typeName);

if (entityType == null) {
LOG.warn("Vertex {} has unrecognized typeName {}. Skipping.", vertex.getId(), typeName);
}

return entityType;
}

private boolean skipVertexForDelete(AtlasVertex vertex) {
boolean ret = true;

Expand Down
Loading
Loading