ATLAS-2840: Regression - Tag Propagation, Deleted Entity : When an entity is…

repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java

@@ -98,6 +98,7 @@ import static org.apache.atlas.repository.Constants.RELATIONSHIPTYPE_BLOCKED_PRO
 import static org.apache.atlas.repository.Constants.RELATIONSHIPTYPE_TAG_PROPAGATION_KEY;
 import static org.apache.atlas.repository.Constants.STATE_PROPERTY_KEY;
 import static org.apache.atlas.repository.Constants.SUPER_TYPES_PROPERTY_KEY;
+import static org.apache.atlas.repository.Constants.TERM_ASSIGNMENT_LABEL;
 import static org.apache.atlas.repository.Constants.TIMESTAMP_PROPERTY_KEY;
 import static org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2.isReference;
 import static org.apache.atlas.type.AtlasStructType.AtlasAttribute.AtlasRelationshipEdgeDirection.BOTH;
@@ -165,6 +166,9 @@ public final class GraphHelper {
         return INSTANCE;
     }
 
+    public static boolean isTermEntityEdge(AtlasEdge edge) {
+        return StringUtils.equals(edge.getLabel(), TERM_ASSIGNMENT_LABEL);
+    }
 
     public AtlasVertex createVertexWithIdentity(Referenceable typedInstance, Set<String> superTypeNames) {
         final String guid = UUID.randomUUID().toString();

repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerV1.java

@@ -29,7 +29,6 @@ import org.apache.atlas.model.instance.AtlasEntity.Status;
 import org.apache.atlas.model.instance.AtlasObjectId;
 import org.apache.atlas.model.typedef.AtlasRelationshipDef.PropagateTags;
 import org.apache.atlas.model.typedef.AtlasStructDef.AtlasAttributeDef;
-import org.apache.atlas.repository.Constants;
 import org.apache.atlas.repository.graph.AtlasEdgeLabel;
 import org.apache.atlas.repository.graph.GraphHelper;
 import org.apache.atlas.repository.graphdb.AtlasEdge;
@@ -449,8 +448,14 @@ public abstract class DeleteHandlerV1 {
             }
         }
 
+        boolean isTermEntityEdge = isTermEntityEdge(edge);
+
         for (AtlasVertex classificationVertex : removePropagationsMap.keySet()) {
-            removeTagPropagation(classificationVertex, removePropagationsMap.get(classificationVertex));
+            boolean removePropagations = getRemovePropagations(classificationVertex);
+
+            if (isTermEntityEdge || removePropagations) {
+                removeTagPropagation(classificationVertex, removePropagationsMap.get(classificationVertex));
+            }
         }
     }